Merge lp:~aptdaemon-developers/sessioninstaller/multiarch into lp:sessioninstaller

[Sebastian Heinlein]

fix installing codecs on multi arch systems

[Sebastian Heinlein (glatzor)]

This branch depends on the fix of bug 966916 in python-apt

[Michael Vogt (mvo)]

This looks good, thanks for you detailed analysis of this!

review: Approve

=== modified file 'sessioninstaller/core.py'
--- sessioninstaller/core.py	2012-03-28 10:16:59 +0000
+++ sessioninstaller/core.py	2012-03-28 10:23:18 +0000
@@ -33,6 +33,7 @@
 
 import apt
 import apt.debfile
+import apt_pkg
 from aptdaemon.policykit1 import get_pid_from_dbus_name
 from defer import Deferred, defer, inline_callbacks, return_value
 from defer.utils import dbus_deferred_method
@@ -314,7 +315,7 @@
         score -- the ranking of the package which should be used for ordering
         restricted -- if the use or redistribution is restriceted
         """
-        if name in RESTRICTED_PACKAGES or restricted:
+        if restricted:
             #TRANSLATORS: %s is the name of a piece of software
             tooltip = _("The use of %s may be restricted in some "
                         "countries. You must verify that one of the following "
@@ -345,10 +346,8 @@
         details -- additional information about the package
         score -- the ranking of the package which should be used for ordering
         """
-        restricted = pkg.candidate.origins[0].component in ("non-free",
-                                                            "multiverse")
         self.add_confirm(pkg.name, pkg.summary, active, details, score,
-                         restricted)
+                         _is_package_restricted(pkg))
 
     def get_selected_pkgs(self):
         """Return a list of the package names which are selected."""
@@ -389,6 +388,8 @@
         """Show a warning icon for restricted packages."""
         if model.get_value(iter, COLUMN_TOOLTIP):
             renderer.props.stock_id = Gtk.STOCK_DIALOG_WARNING
+        else:
+            renderer.props.stock_id = None
 
     def run(self):
         """Run the dialog."""
@@ -1267,6 +1268,27 @@
         pkgs = []
         partial_providers = False
         self._init_cache(progress)
+
+        # Get the architectures with an installed gstreamer library
+        # Unfortunately the architecture isn't part of the request. So we
+        # have to detect for which architectuers gstreamer has been installed
+        # on the system, to avoid showing codecs for not used  but enabeled
+        # architecures, see LP #899001
+        architectures = apt_pkg.get_architectures()
+        supported_archs = set()
+        if len(architectures) > 1:
+            for gst_version in set([struct.version for struct in structures]):
+                for arch in architectures:
+                    try:
+                        pkg = self._cache["libgstreamer%s-0:%s" % (gst_version,
+                                                                   arch)]
+                    except KeyError:
+                        continue
+                    if pkg.is_installed:
+                        supported_archs.add(arch)
+        else:
+            supported_archs = architectures
+
         for count, pkg in enumerate(self._cache):
             if not count % 100:
                 while Gtk.events_pending():
@@ -1276,8 +1298,10 @@
                     progress.hide()
                     progress.destroy()
                     raise errors.ModifyCancelled
-            if pkg.is_installed or not pkg.candidate or \
-               not "Gstreamer-Version" in pkg.candidate.record:
+            if (pkg.is_installed or
+                not pkg.candidate or 
+                not "Gstreamer-Version" in pkg.candidate.record or
+                not pkg.candidate.architecture in supported_archs):
                 continue
             # Check if the package could not be free in usage or distribution
             # Allow to prefer special packages
@@ -1285,8 +1309,7 @@
                 score = GSTREAMER_SCORING[pkg.name]
             except KeyError:
                 score = 0
-            if pkg.name in RESTRICTED_PACKAGES or \
-               pkg.candidate.origins[0].component in ("non-free", "multiverse"):
+            if _is_package_restricted(pkg):
                 score -= 10
             provides = []
             for struct in structures:
@@ -1309,7 +1332,8 @@
                 provides.append(struct.name)
                 struct.satisfied = True
                 if score > struct.best_score:
-                    struct.best_provider = pkg.name
+                    struct.best_provider = pkg.name.split(":")[0]
+                    struct.best_score = score
             if provides:
                 provides_all = len(structures) == len(provides)
                 if not provides_all:
@@ -1358,7 +1382,8 @@
             else:
                 #TRANSLATORS: Separator for a list of plugins
                 details = _(",\n").join(provides)
-            install = pkg.name in best_providers
+            # Skip the architecture from the name
+            install = pkg.name.split(":")[0] in best_providers
             confirm.add_confirm_package(pkg, install, details, score)
         res = confirm.run()
         if res == Gtk.ResponseType.OK:
@@ -1468,6 +1493,14 @@
                 text += "\n• %s" % element
         return text
 
+
+def _is_package_restricted(pkg):
+    """If a package is possibly restricted in use."""
+    return (pkg.name.split(":")[0] in RESTRICTED_PACKAGES or
+            pkg.candidate.origins[0].component in ("non-free",
+                                                   "restricted",
+                                                   "multiverse"))
+
 def main():
     log.setLevel(logging.DEBUG)
     si = SessionInstaller()

=== modified file 'sessioninstaller/utils.py'
--- sessioninstaller/utils.py	2010-06-26 10:21:41 +0000
+++ sessioninstaller/utils.py	2012-03-28 10:23:18 +0000
@@ -52,6 +52,10 @@
     use the name and comment of the applications.
     """
     markup = ""
+    try:
+        pkg, arch = pkg.split(":")
+    except ValueError:
+        arch = None
     if axi:
         for m in axi.postlist("XP" + pkg):
             doc = axi.get_document(m.docid)
@@ -65,11 +69,17 @@
                     app_name = de.getName()
                     app_comment = de.getComment()
                     if app_name:
-                        markup += "<b>%s</b>" % app_name
+                        markup += "<b>%s" % app_name
+                        if arch:
+                            markup += " (%s)" % arch
+                        markup += "</b>"
                         if app_comment:
                             markup += "\n%s" % app_comment
     if not markup:
-        markup = "<b>%s</b>" % pkg
+        if arch:
+            markup = "<b>%s (%s)</b>" % (pkg, arch)
+        else:
+            markup = "<b>%s</b>" % pkg
         if summary:
             markup += "\n%s" % summary
     return markup