Merge lp:~mvo/software-center/lp970627 into lp:software-center/5.2

[Michael Vogt]

Trivial branch that just catches any IOError in _cleanup_dir(). This shows up on errors.ubuntu.com in the software-center sub page as top 4 (top 3 actually as #2,#3 look like dupes).

[Gary Lasker (gary-lasker)]

Hi Michael, this looks fine. I'll merge to 5.2 now. Many thanks!

review: Approve

=== modified file 'softwarecenter/expunge.py'
--- softwarecenter/expunge.py	2012-03-27 08:57:34 +0000
+++ softwarecenter/expunge.py	2012-06-05 07:24:20 +0000
@@ -55,18 +55,21 @@
         for root, dirs, files in os.walk(path):
             for f in files:
                 fullpath = os.path.join(root, f)
-                header = open(fullpath).readline().strip()
-                if not header.startswith("status:"):
-                    logging.debug(
-                        "Skipping files with unknown header: '%s'" % f)
-                    continue
-                if self.keep_only_http200 and header != "status: 200":
-                    self._rm(fullpath)
-                if self.keep_time:
-                    mtime = os.path.getmtime(fullpath)
-                    logging.debug("mtime of '%s': '%s" % (f, mtime))
-                    if (mtime + self.keep_time) < now:
+                try:
+                    header = open(fullpath).readline().strip()
+                    if not header.startswith("status:"):
+                        logging.debug(
+                            "Skipping files with unknown header: '%s'" % f)
+                        continue
+                    if self.keep_only_http200 and header != "status: 200":
                         self._rm(fullpath)
+                    if self.keep_time:
+                        mtime = os.path.getmtime(fullpath)
+                        logging.debug("mtime of '%s': '%s" % (f, mtime))
+                        if (mtime + self.keep_time) < now:
+                            self._rm(fullpath)
+                except IOError as e:
+                    logging.debug("ioerror in cleandir: %s" % e)
 
     def clean(self):
         # go over the directories