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

[Gary Lasker]

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.

[Michael Vogt (mvo)]

Thanks, merged now!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-26 19:26:32 +0000
+++ debian/changelog	2010-11-17 21:01:31 +0000
@@ -1,3 +1,10 @@
+software-center (3.0.7) UNRELEASED; urgency=low
+
+  * softwarecenter/backend/aptd.py:
+    - fix crash during reload (LP: #673991)
+
+ -- Gary Lasker <[e-mail]>  Wed, 17 Nov 2010 11:39:57 -0500
+
 software-center (3.0.6) maverick-proposed; urgency=low
 
   * softwarecenter/backend/aptd.py:
 
=== modified file 'softwarecenter/backend/aptd.py'
--- softwarecenter/backend/aptd.py	2010-10-26 19:26:32 +0000
+++ softwarecenter/backend/aptd.py	2010-11-17 21:01:31 +0000
@@ -245,7 +245,8 @@
         # aptsources will just enable it instead of adding a extra 
         # sources.list.d file (LP: #666956)
         d = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
-        if not os.path.exists(os.path.join(d, sources_list)):
+        if (not sources_list or
+            not os.path.exists(os.path.join(d, sources_list))):
             sources_list=""
         try:
             trans = yield self.aptd_client.update_cache(