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

Proposed by Michael Vogt on 2012-06-05
Status: Superseded
Proposed branch: lp:~mvo/software-center/lp970627
Merge into: lp:software-center
Diff against target: 104 lines (+28/-12) (has conflicts)
4 files modified
debian/changelog (+5/-1)
softwarecenter/expunge.py (+14/-11)
test/gtk3/test_catview.py (+8/-0)
test/test_package_info.py (+1/-0)
Text conflict in debian/changelog
Text conflict in test/gtk3/test_catview.py
To merge this branch: bzr merge lp:~mvo/software-center/lp970627
Reviewer Review Type Date Requested Status
software-store-developers 2012-06-05 Pending
Review via email: mp+108685@code.launchpad.net

This proposal has been superseded by a proposal from 2012-06-05.

Description of the change

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

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-01 19:14:37 +0000
3+++ debian/changelog 2012-06-05 07:02:19 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 software-center (5.3.0) quantal; urgency=low
7
8 [ Robert Roth ]
9@@ -38,6 +39,9 @@
10 -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Jun 2012 19:54:38 +0200
11
12 software-center (5.2.3) UNRELEASEDprecise-proposed; urgency=low
13+=======
14+software-center (5.2.3) precise-proposed; urgency=low
15+>>>>>>> MERGE-SOURCE
16
17 [ Robert Roth ]
18 * lp:~evfool/software-center/lp987801:
19@@ -98,7 +102,7 @@
20 - Filtered out those exhibits that do not their packages available
21 in the db (LP: #986563)
22
23- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 May 2012 10:07:45 +0200
24+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Jun 2012 08:53:25 +0200
25
26 software-center (5.2.2.2) precise-proposed; urgency=low
27
28
29=== modified file 'softwarecenter/expunge.py'
30--- softwarecenter/expunge.py 2012-03-27 08:57:34 +0000
31+++ softwarecenter/expunge.py 2012-06-05 07:02:19 +0000
32@@ -55,18 +55,21 @@
33 for root, dirs, files in os.walk(path):
34 for f in files:
35 fullpath = os.path.join(root, f)
36- header = open(fullpath).readline().strip()
37- if not header.startswith("status:"):
38- logging.debug(
39- "Skipping files with unknown header: '%s'" % f)
40- continue
41- if self.keep_only_http200 and header != "status: 200":
42- self._rm(fullpath)
43- if self.keep_time:
44- mtime = os.path.getmtime(fullpath)
45- logging.debug("mtime of '%s': '%s" % (f, mtime))
46- if (mtime + self.keep_time) < now:
47+ try:
48+ header = open(fullpath).readline().strip()
49+ if not header.startswith("status:"):
50+ logging.debug(
51+ "Skipping files with unknown header: '%s'" % f)
52+ continue
53+ if self.keep_only_http200 and header != "status: 200":
54 self._rm(fullpath)
55+ if self.keep_time:
56+ mtime = os.path.getmtime(fullpath)
57+ logging.debug("mtime of '%s': '%s" % (f, mtime))
58+ if (mtime + self.keep_time) < now:
59+ self._rm(fullpath)
60+ except IOError as e:
61+ logging.debug("ioerror in cleandir: %s" % e)
62
63 def clean(self):
64 # go over the directories
65
66=== modified file 'test/gtk3/test_catview.py'
67--- test/gtk3/test_catview.py 2012-06-01 19:14:37 +0000
68+++ test/gtk3/test_catview.py 2012-06-05 07:02:19 +0000
69@@ -115,7 +115,11 @@
70 class RecommendationsTestCase(CatViewBaseTestCase):
71 """The test suite for the recommendations ."""
72
73+<<<<<<< TREE
74 # FIXME: reenable
75+=======
76+ @unittest.skip("Disabled because of race condition in test")
77+>>>>>>> MERGE-SOURCE
78 @patch('softwarecenter.backend.recagent.RecommenderAgent.is_opted_in')
79 def disabled_test_recommended_for_you_opt_in_display(
80 self, mock_get_recommender_opted_in):
81@@ -128,7 +132,11 @@
82 FramedHeaderBox.CONTENT)
83 self.assertTrue(self.rec_panel.opt_in_vbox.get_property("visible"))
84
85+<<<<<<< TREE
86 # FIXME: reenable
87+=======
88+ @unittest.skip("Disabled because of race condition in test")
89+>>>>>>> MERGE-SOURCE
90 # patch out the agent query method to avoid making the actual server call
91 @patch('softwarecenter.backend.recagent.RecommenderAgent.is_opted_in')
92 @patch('softwarecenter.backend.recagent.RecommenderAgent'
93
94=== modified file 'test/test_package_info.py'
95--- test/test_package_info.py 2012-01-16 14:42:49 +0000
96+++ test/test_package_info.py 2012-06-05 07:02:19 +0000
97@@ -65,6 +65,7 @@
98 pkginfo = self.pkginfo
99 self.assertTrue(len(pkginfo.get_addons("firefox")) > 0)
100
101+ @unittest.skip("disabled due to invalid fixture data")
102 def test_removal(self):
103 pkginfo = self.pkginfo
104 pkg = pkginfo['coreutils']

Subscribers

People subscribed via source and target branches