Merge lp:~gary-lasker/software-center/lp673991 into lp:software-center

Proposed by Gary Lasker
Status: Merged
Merged at revision: 1282
Proposed branch: lp:~gary-lasker/software-center/lp673991
Merge into: lp:software-center
Diff against target: 35 lines (+5/-2)
2 files modified
debian/changelog (+3/-1)
softwarecenter/backend/aptd.py (+2/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/lp673991
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+41097@code.launchpad.net

Description of the change

This is a proposed fix for bug 673991. It accounts for the condition were a call to the reload method results in sources_list being None (such as is the case when following the steps to reproduce as described in the description for bug 673991).

Note that I verified the fix for bug 666956 is still good with this change.

To post a comment you must log in.

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 2010-11-16 23:08:18 +0000
3+++ debian/changelog 2010-11-17 20:56:11 +0000
4@@ -24,6 +24,8 @@
5 softwarecenter/view/widgets/spinner.py:
6 - refactor spinner code
7 - make a spinner panel widget and add label support
8+ * softwarecenter/backend/aptd.py:
9+ - fix crash during reload (LP: #673991)
10
11 [ Michael Vogt ]
12 * softwarecenter/view/purchasedialog.py:
13@@ -41,7 +43,7 @@
14 * debian/rules: Build with scour for SVG optimization. Add python-scour
15 build dependency.
16
17- -- Gary Lasker <gary.lasker@canonical.com> Tue, 16 Nov 2010 18:03:35 -0500
18+ -- Gary Lasker <gary.lasker@canonical.com> Wed, 17 Nov 2010 11:37:18 -0500
19
20 software-center (3.1.0) natty; urgency=low
21
22
23=== modified file 'softwarecenter/backend/aptd.py'
24--- softwarecenter/backend/aptd.py 2010-10-26 19:26:32 +0000
25+++ softwarecenter/backend/aptd.py 2010-11-17 20:56:11 +0000
26@@ -245,7 +245,8 @@
27 # aptsources will just enable it instead of adding a extra
28 # sources.list.d file (LP: #666956)
29 d = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
30- if not os.path.exists(os.path.join(d, sources_list)):
31+ if (not sources_list or
32+ not os.path.exists(os.path.join(d, sources_list))):
33 sources_list=""
34 try:
35 trans = yield self.aptd_client.update_cache(

Subscribers

People subscribed via source and target branches