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

[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).

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-01 19:14:37 +0000
+++ debian/changelog	2012-06-05 07:02:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 software-center (5.3.0) quantal; urgency=low
 
   [ Robert Roth ]
@@ -38,6 +39,9 @@
  -- Michael Vogt <[e-mail]>  Fri, 01 Jun 2012 19:54:38 +0200
 
 software-center (5.2.3) UNRELEASEDprecise-proposed; urgency=low
+=======
+software-center (5.2.3) precise-proposed; urgency=low
+>>>>>>> MERGE-SOURCE
 
   [ Robert Roth ]
   * lp:~evfool/software-center/lp987801:
@@ -98,7 +102,7 @@
     - Filtered out those exhibits that do not their packages available 
       in the db (LP: #986563)
 
- -- Michael Vogt <[e-mail]>  Thu, 31 May 2012 10:07:45 +0200
+ -- Michael Vogt <[e-mail]>  Mon, 04 Jun 2012 08:53:25 +0200
 
 software-center (5.2.2.2) precise-proposed; urgency=low
 
 
=== modified file 'softwarecenter/expunge.py'
--- softwarecenter/expunge.py	2012-03-27 08:57:34 +0000
+++ softwarecenter/expunge.py	2012-06-05 07:02:19 +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
 
=== modified file 'test/gtk3/test_catview.py'
--- test/gtk3/test_catview.py	2012-06-01 19:14:37 +0000
+++ test/gtk3/test_catview.py	2012-06-05 07:02:19 +0000
@@ -115,7 +115,11 @@
 class RecommendationsTestCase(CatViewBaseTestCase):
     """The test suite for the recommendations ."""
 
+<<<<<<< TREE
     # FIXME: reenable
+=======
+    @unittest.skip("Disabled because of race condition in test")
+>>>>>>> MERGE-SOURCE
     @patch('softwarecenter.backend.recagent.RecommenderAgent.is_opted_in')
     def disabled_test_recommended_for_you_opt_in_display(
                                         self, mock_get_recommender_opted_in):
@@ -128,7 +132,11 @@
                          FramedHeaderBox.CONTENT)
         self.assertTrue(self.rec_panel.opt_in_vbox.get_property("visible"))
 
+<<<<<<< TREE
     # FIXME: reenable
+=======
+    @unittest.skip("Disabled because of race condition in test")
+>>>>>>> MERGE-SOURCE
     # patch out the agent query method to avoid making the actual server call
     @patch('softwarecenter.backend.recagent.RecommenderAgent.is_opted_in')
     @patch('softwarecenter.backend.recagent.RecommenderAgent'
 
=== modified file 'test/test_package_info.py'
--- test/test_package_info.py	2012-01-16 14:42:49 +0000
+++ test/test_package_info.py	2012-06-05 07:02:19 +0000
@@ -65,6 +65,7 @@
         pkginfo = self.pkginfo
         self.assertTrue(len(pkginfo.get_addons("firefox")) > 0)
 
+    @unittest.skip("disabled due to invalid fixture data")
     def test_removal(self):
         pkginfo = self.pkginfo
         pkg = pkginfo['coreutils']