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

Proposed by Gary Lasker
Status: Merged
Merged at revision: 1118
Proposed branch: lp:~gary-lasker/software-center/lp673991-for-3.0
Merge into: lp:software-center/3.0
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
softwarecenter/backend/aptd.py (+2/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/lp673991-for-3.0
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+41098@code.launchpad.net

Description of the change

This is a proposed fix for bug 673991, this one for maverick (3.0). 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.
Michael Vogt (mvo) wrote :

Thanks, merged now!

review: Approve

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-10-26 19:26:32 +0000
3+++ debian/changelog 2010-11-17 21:01:31 +0000
4@@ -1,3 +1,10 @@
5+software-center (3.0.7) UNRELEASED; urgency=low
6+
7+ * softwarecenter/backend/aptd.py:
8+ - fix crash during reload (LP: #673991)
9+
10+ -- Gary Lasker <gary.lasker@canonical.com> Wed, 17 Nov 2010 11:39:57 -0500
11+
12 software-center (3.0.6) maverick-proposed; urgency=low
13
14 * softwarecenter/backend/aptd.py:
15
16=== modified file 'softwarecenter/backend/aptd.py'
17--- softwarecenter/backend/aptd.py 2010-10-26 19:26:32 +0000
18+++ softwarecenter/backend/aptd.py 2010-11-17 21:01:31 +0000
19@@ -245,7 +245,8 @@
20 # aptsources will just enable it instead of adding a extra
21 # sources.list.d file (LP: #666956)
22 d = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
23- if not os.path.exists(os.path.join(d, sources_list)):
24+ if (not sources_list or
25+ not os.path.exists(os.path.join(d, sources_list))):
26 sources_list=""
27 try:
28 trans = yield self.aptd_client.update_cache(

Subscribers

People subscribed via source and target branches