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

[Michael Vogt]

This branch fixes two crashes when apt-xapian-index is not installed or was installed and got removed.

- do not crash if apt-xapian-index is not installed (LP: #976337)
- ignore xapian.DatabaseOpeningError here (happens when there is no a-x-i so we don't care)

[Gary Lasker (gary-lasker)]

Very nice, thank you, mvo!

[Gary Lasker (gary-lasker)]

review: Approve

=== modified file 'utils/update-software-center-channels'
--- utils/update-software-center-channels	2012-01-03 11:27:15 +0000
+++ utils/update-software-center-channels	2012-04-13 12:08:26 +0000
@@ -5,6 +5,7 @@
 DBusGMainLoop(set_as_default=True)
 import logging
 import sys
+import xapian
 
 from gi.repository import GObject
 
@@ -15,19 +16,19 @@
 LOG = logging.getLogger("update-software-center-channels")
 
 def compare_channels_in_db_to_cache(db):
-        # the operation get_origins can take some time (~60s?)
-        cache_origins = set(db._aptcache.get_all_origins())
-        db_origins = set(db.get_origins_from_db())
-        # origins
-        LOG.debug("cache_origins: %s" % cache_origins)
-        LOG.debug("db_origins: %s" % db_origins)
-        # the db_origins will contain origins from the s-c-agent, so
-        # we don't need to rebuild if the db has more origins then
-        # the cache, but we need to rebuild if the cache has origins
-        # that a-x-i does not have
-        if not cache_origins.issubset(db_origins):
-            return True
-        return False
+    # the operation get_origins can take some time (~60s?)
+    cache_origins = set(db._aptcache.get_all_origins())
+    db_origins = set(db.get_origins_from_db())
+    # origins
+    LOG.debug("cache_origins: %s" % cache_origins)
+    LOG.debug("db_origins: %s" % db_origins)
+    # the db_origins will contain origins from the s-c-agent, so
+    # we don't need to rebuild if the db has more origins then
+    # the cache, but we need to rebuild if the cache has origins
+    # that a-x-i does not have
+    if not cache_origins.issubset(db_origins):
+        return True
+    return False
 
 def trigger_axi_update_and_wait():
     def _axi_finished(res):
@@ -35,11 +36,11 @@
     context = GObject.main_context_default()
     main = GObject.MainLoop(context)
     system_bus = dbus.SystemBus()
-    axi = dbus.Interface(
-        system_bus.get_object("org.debian.AptXapianIndex","/"),
-        "org.debian.AptXapianIndex")
-    axi.connect_to_signal("UpdateFinished", _axi_finished)
     try:
+        axi = dbus.Interface(
+            system_bus.get_object("org.debian.AptXapianIndex","/"),
+            "org.debian.AptXapianIndex")
+        axi.connect_to_signal("UpdateFinished", _axi_finished)
         # first arg is force, second update_only
         axi.update_async(True, False)
         main.run()
@@ -62,9 +63,13 @@
         logging.basicConfig(level=logging.DEBUG)
 
     # do it
-    res = check_for_channel_updates_and_trigger_axi()
-    # return "1" means xapian got updated
-    if res:
-        sys.exit(1)
+    try:
+        res = check_for_channel_updates_and_trigger_axi()
+        # return "1" means xapian got updated
+        if res:
+            sys.exit(1)
+    except xapian.DatabaseOpeningError as e:
+        # this can happen if there is no a-x-i DB yet and we can ignore it
+        LOG.info("failed to open xapian db: '%s'" % e)
     # return "0" nothing was done
     sys.exit(0)