Merge lp:~ilidrissi.amine/software-center/addons-provides into lp:software-center

[Mohamed Amine Ilidrissi]

This branch changes the add-on implementation: packages that enhances a package that is provided by the application are now add-ons.

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-27 08:46:56 +0000
+++ debian/changelog	2010-08-27 13:19:39 +0000
@@ -9,7 +9,11 @@
   * softwarecenter/apt/aptcache.py:
     - don't crash on encountering broken packages while getting deps
   
- -- Michael Vogt <[e-mail]>  Fri, 27 Aug 2010 09:57:53 +0200
+  [ Mohamed Amine IL Idrissi ]
+  * softwarecenter/apt/aptcache.py: Packages that enhance a package that
+    is provided by the main app are now add-ons (LP: #625252)
+
+ -- Mohamed Amine IL Idrissi <[e-mail]>  Fri, 27 Aug 2010 13:10:54 +0000
 
 software-center (2.1.14.1) maverick; urgency=low
 

=== modified file 'softwarecenter/apt/aptcache.py'
--- softwarecenter/apt/aptcache.py	2010-08-26 18:03:31 +0000
+++ softwarecenter/apt/aptcache.py	2010-08-27 13:19:39 +0000
@@ -220,7 +220,11 @@
     def get_enhances(self, pkg):
         return self._get_depends_by_type_str(pkg, self.ENHANCES_TYPES)
     def get_provides(self, pkg):
-        return self._get_depends_by_type_str(pkg, self.PROVIDES_TYPES)
+        provides_list = pkg.candidate._cand.provides_list
+        provides = []
+        for provided in provides_list:
+            provides.append(provided[0]) # the package name
+        return provides
 
     # reverse pkg relations
     def get_rdepends(self, pkg):
@@ -231,6 +235,12 @@
         return self._get_rdepends_by_type(pkg, self.SUGGESTS_TYPES, False)
     def get_renhances(self, pkg):
         return self._get_rdepends_by_type(pkg, self.ENHANCES_TYPES, False)
+    def get_renhances_lowlevel(self, pkg):
+        renhances = []
+        for dep in pkg.rev_depends_list:
+            if dep.dep_type_untranslated == "Enhances":
+                renhances.append(dep.parent_pkg.name)
+        return renhances
     def get_rprovides(self, pkg):
         return self._get_rdepends_by_type(pkg, self.PROVIDES_TYPES, False)
 
@@ -369,6 +379,13 @@
         renhances = self.get_renhances(pkg)
         LOG.debug("renhances: %s" % renhances)
         addons_sug += renhances
+        provides = self.get_provides(pkg)
+        LOG.debug("provides: %s" % provides)
+        for provide in provides:
+            virtual_pkg = self._cache._cache[provide]
+            renhances = self.get_renhances_lowlevel(virtual_pkg)
+            LOG.debug("renhances of %s: %s" % (provide, renhances))
+            addons_sug += renhances
 
         # get more addons, the idea is that if a package foo-data
         # just depends on foo we want to get the info about