Ubuntu Software Center

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

  1. addons-provides
  2. Merge into trunk
Proposed by Mohamed Amine Ilidrissi
Status: Merged
Merged at revision: 1082
Proposed branch: lp:~ilidrissi.amine/software-center/addons-provides
Merge into: lp:software-center
Diff against target: 60 lines (+23/-2)
2 files modified
debian/changelog (+5/-1)
softwarecenter/apt/aptcache.py (+18/-1)
To merge this branch: bzr merge lp:~ilidrissi.amine/software-center/addons-provides
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+33903@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
9 * softwarecenter/apt/aptcache.py:9 * softwarecenter/apt/aptcache.py:
10 - don't crash on encountering broken packages while getting deps10 - don't crash on encountering broken packages while getting deps
11 11
12 -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 27 Aug 2010 09:57:53 +020012 [ Mohamed Amine IL Idrissi ]
13 * softwarecenter/apt/aptcache.py: Packages that enhance a package that
14 is provided by the main app are now add-ons (LP: #625252)
15
16 -- Mohamed Amine IL Idrissi <ilidrissiamine@gmail.com> Fri, 27 Aug 2010 13:10:54 +0000
1317
14software-center (2.1.14.1) maverick; urgency=low18software-center (2.1.14.1) maverick; urgency=low
1519
1620
=== 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 @@
220 def get_enhances(self, pkg):220 def get_enhances(self, pkg):
221 return self._get_depends_by_type_str(pkg, self.ENHANCES_TYPES)221 return self._get_depends_by_type_str(pkg, self.ENHANCES_TYPES)
222 def get_provides(self, pkg):222 def get_provides(self, pkg):
223 return self._get_depends_by_type_str(pkg, self.PROVIDES_TYPES)223 provides_list = pkg.candidate._cand.provides_list
224 provides = []
225 for provided in provides_list:
226 provides.append(provided[0]) # the package name
227 return provides
224228
225 # reverse pkg relations229 # reverse pkg relations
226 def get_rdepends(self, pkg):230 def get_rdepends(self, pkg):
@@ -231,6 +235,12 @@
231 return self._get_rdepends_by_type(pkg, self.SUGGESTS_TYPES, False)235 return self._get_rdepends_by_type(pkg, self.SUGGESTS_TYPES, False)
232 def get_renhances(self, pkg):236 def get_renhances(self, pkg):
233 return self._get_rdepends_by_type(pkg, self.ENHANCES_TYPES, False)237 return self._get_rdepends_by_type(pkg, self.ENHANCES_TYPES, False)
238 def get_renhances_lowlevel(self, pkg):
239 renhances = []
240 for dep in pkg.rev_depends_list:
241 if dep.dep_type_untranslated == "Enhances":
242 renhances.append(dep.parent_pkg.name)
243 return renhances
234 def get_rprovides(self, pkg):244 def get_rprovides(self, pkg):
235 return self._get_rdepends_by_type(pkg, self.PROVIDES_TYPES, False)245 return self._get_rdepends_by_type(pkg, self.PROVIDES_TYPES, False)
236246
@@ -369,6 +379,13 @@
369 renhances = self.get_renhances(pkg)379 renhances = self.get_renhances(pkg)
370 LOG.debug("renhances: %s" % renhances)380 LOG.debug("renhances: %s" % renhances)
371 addons_sug += renhances381 addons_sug += renhances
382 provides = self.get_provides(pkg)
383 LOG.debug("provides: %s" % provides)
384 for provide in provides:
385 virtual_pkg = self._cache._cache[provide]
386 renhances = self.get_renhances_lowlevel(virtual_pkg)
387 LOG.debug("renhances of %s: %s" % (provide, renhances))
388 addons_sug += renhances
372389
373 # get more addons, the idea is that if a package foo-data390 # get more addons, the idea is that if a package foo-data
374 # just depends on foo we want to get the info about391 # just depends on foo we want to get the info about

Subscribers

People subscribed via source and target branches