Merge lp:~mvo/software-center/fix-chroot-lp1040311 into lp:software-center

[Michael Vogt]

Fix crash if there is no system dbus, this can happen e.g. when running
inside a chroot environment.

[Gary Lasker (gary-lasker)]

A unit test and a bug fix, perfect! Thanks, mvo.

review: Approve

=== modified file 'softwarecenter/db/pkginfo_impl/aptcache.py'
--- softwarecenter/db/pkginfo_impl/aptcache.py	2012-08-20 09:56:39 +0000
+++ softwarecenter/db/pkginfo_impl/aptcache.py	2012-08-29 11:44:19 +0000
@@ -139,7 +139,12 @@
         # this is fast, so ok
         self._language_packages = self._read_language_pkgs()
         # query the totalize on install using aptdaemon
-        self.aptd_client = AptClient()
+        try:
+            self.aptd_client = AptClient()
+        except Exception as e:
+            self.aptd_client = None
+            logging.error("Can not get aptdaemon client: '%s', on "
+                          "size information will be available " % e)
         self._aptd_trans = None
 
     @staticmethod

=== modified file 'tests/test_pkginfo.py'
--- tests/test_pkginfo.py	2012-08-20 09:55:18 +0000
+++ tests/test_pkginfo.py	2012-08-29 11:44:19 +0000
@@ -11,6 +11,7 @@
 )
 setup_test_env()
 
+import softwarecenter
 from softwarecenter.db.pkginfo import get_pkg_info
 from softwarecenter.utils import ExecutionTime
 
@@ -83,6 +84,11 @@
             to_install = args[0]
             self.assertTrue(to_install[0].endswith("/%s" % archive_suite))
 
+    @patch("softwarecenter.db.pkginfo_impl.aptcache.AptClient")
+    def test_aptd_client_unavailable(self, mock_apt_client):
+        mock_apt_client.side_effect = Exception("fake")
+        cache = softwarecenter.db.pkginfo_impl.aptcache.AptCache()
+        self.assertEqual(cache.aptd_client, None)
 
 if __name__ == "__main__":
     unittest.main()