Merge lp:~gary-lasker/software-center/for-3.0-osomon-fix-lp725186 into lp:software-center/3.0

[Gary Lasker]

This is a backport to maverick from Olivier Tilloy of his fix for bug 725186. We should consider this for an SRU. Please see the bug for details.

Thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-10 08:25:06 +0000
+++ debian/changelog	2011-03-03 02:13:01 +0000
@@ -1,3 +1,11 @@
+software-center (3.0.9) UNRELEASED; urgency=low
+
+  [ Olivier Tilloy ]
+  * softwarecenter/apt/apthistory.py:
+    - fix startup crash if the history file is corrupted (LP: #725186)
+
+ -- Gary Lasker <[e-mail]>  Mon, 28 Feb 2011 16:20:50 -0500
+
 software-center (3.0.8) maverick-proposed; urgency=low
 
   [ Gary Lasker ]

=== modified file 'softwarecenter/apt/apthistory.py'
--- softwarecenter/apt/apthistory.py	2010-09-16 09:50:32 +0000
+++ softwarecenter/apt/apthistory.py	2011-03-03 02:13:01 +0000
@@ -27,6 +27,7 @@
 import logging
 import string
 import datetime
+import zlib
 
 
 from datetime import datetime
@@ -107,23 +108,28 @@
         except IOError, ioe:
             LOG.debug(ioe)
             return
-        for stanza in deb822.Deb822.iter_paragraphs(f):
-            # keep the UI alive
-            while self.main_context.pending():
-                self.main_context.iteration()
-            # ignore records with 
-            try:
-                trans = Transaction(stanza)
-            except KeyError, e:
-                continue
-            # ignore the ones we have already
-            if (rescan and
-                len(self.transactions) > 0 and
-                trans.start_date < self.transactions[0].start_date):
-                break
-            # add it
-            self.transactions.insert(0, trans)
-            
+        try:
+            for stanza in deb822.Deb822.iter_paragraphs(f):
+                # keep the UI alive
+                while self.main_context.pending():
+                    self.main_context.iteration()
+                # ignore records with 
+                try:
+                    trans = Transaction(stanza)
+                except KeyError, e:
+                    continue
+                # ignore the ones we have already
+                if (rescan and
+                    len(self.transactions) > 0 and
+                    trans.start_date < self.transactions[0].start_date):
+                    break
+                # add it
+                self.transactions.insert(0, trans)
+        except zlib.error, ze:
+            # corrupted history file, skip it
+            # (see http://bugs.launchpad.net/bugs/725186)
+            LOG.debug(ze)
+
     def _on_apt_history_changed(self, monitor, afile, other_file, event):
         if event == gio.FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
             self._scan(self.history_file, rescan = True)