Ubuntu Software Center

Merge lp:~mpt/software-center/bug-499893 into lp:software-center

  1. bug-499893
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mpt/software-center/bug-499893
Merge into: lp:software-center
Diff against target: 107 lines (+8/-50)
4 files modified
softwarecenter/distro/Debian.py (+3/-24)
softwarecenter/distro/Ubuntu.py (+3/-24)
softwarecenter/distro/__init__.py (+1/-1)
softwarecenter/view/appdetailsview.py (+1/-1)
To merge this branch: bzr merge lp:~mpt/software-center/bug-499893
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+20645@code.launchpad.net

Description of the change

Fixes bug 499893. Unblocks some of the redesign of the software item screen.

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
1=== modified file 'softwarecenter/distro/Debian.py'
2--- softwarecenter/distro/Debian.py 2010-02-05 16:58:16 +0000
3+++ softwarecenter/distro/Debian.py 2010-03-04 12:33:23 +0000
4@@ -64,33 +64,12 @@
5 break
6 return (primary, button_text)
7
8- def get_rdepends_text(self, cache, pkg, appname):
9+ def get_installation_status(self, cache, pkg, appname):
10 s = ""
11 if pkg.installed:
12 # generic message
13- s = _("%s is installed on this computer.") % appname
14- # show how many packages on the system depend on this
15- installed_rdeps = cache.get_installed_rdepends(pkg)
16- installed_rrecommends = cache.get_installed_rrecommends(pkg)
17- installed_rsuggests = cache.get_installed_rsuggests(pkg)
18- if len(installed_rdeps) > 0:
19- s += " "
20- s += gettext.ngettext(
21- "It is used by %s piece of installed software.",
22- "It is used by %s pieces of installed software.",
23- len(installed_rdeps)) % len(installed_rdeps)
24- elif len(installed_rrecommends) > 0:
25- s += " "
26- s += gettext.ngettext(
27- "It is recommended by %s piece of installed software.",
28- "It is recommended by %s pieces of installed software.",
29- len(installed_rrecommends)) % len(installed_rrecommends)
30- elif len(installed_rsuggests) > 0:
31- s += " "
32- s += gettext.ngettext(
33- "It is suggested by %s piece of installed software.",
34- "It is suggested by %s pieces of installed software.",
35- len(installed_rrecommends)) % len(installed_rrecommends)
36+ s = _("Installed")
37+ # In future, say "Installed since $date"
38 return s
39
40 def get_distro_codename(self):
41
42=== modified file 'softwarecenter/distro/Ubuntu.py'
43--- softwarecenter/distro/Ubuntu.py 2010-02-17 09:14:08 +0000
44+++ softwarecenter/distro/Ubuntu.py 2010-03-04 12:33:23 +0000
45@@ -71,33 +71,12 @@
46 break
47 return (primary, button_text)
48
49- def get_rdepends_text(self, cache, pkg, appname):
50+ def get_installation_status(self, cache, pkg, appname):
51 s = ""
52 if pkg.installed:
53 # generic message
54- s = _("%s is installed on this computer.") % appname
55- # show how many packages on the system depend on this
56- installed_rdeps = cache.get_installed_rdepends(pkg)
57- installed_rrecommends = cache.get_installed_rrecommends(pkg)
58- installed_rsuggests = cache.get_installed_rsuggests(pkg)
59- if len(installed_rdeps) > 0:
60- s += " "
61- s += gettext.ngettext(
62- "It is used by %s installed software package.",
63- "It is used by %s installed software packages.",
64- len(installed_rdeps)) % len(installed_rdeps)
65- elif len(installed_rrecommends) > 0:
66- s += " "
67- s += gettext.ngettext(
68- "It is recommended by %s installed software package.",
69- "It is recommended by %s installed software packages.",
70- len(installed_rrecommends)) % len(installed_rrecommends)
71- elif len(installed_rsuggests) > 0:
72- s += " "
73- s += gettext.ngettext(
74- "It is suggested by %s installed software package.",
75- "It is suggested by %s installed software packages.",
76- len(installed_rrecommends)) % len(installed_rrecommends)
77+ s = _("Installed")
78+ # In future, say "Installed since $date"
79 return s
80
81 def get_distro_codename(self):
82
83=== modified file 'softwarecenter/distro/__init__.py'
84--- softwarecenter/distro/__init__.py 2010-03-03 11:08:21 +0000
85+++ softwarecenter/distro/__init__.py 2010-03-04 12:33:23 +0000
86@@ -45,7 +45,7 @@
87 """ The name in the Release file """
88 return "none"
89
90- def get_rdepends_text(self, pkg):
91+ def get_installation_status(self, pkg):
92 raise UnimplementedError
93
94 def get_maintenance_status(self, cache, appname, pkgname, component, channel):
95
96=== modified file 'softwarecenter/view/appdetailsview.py'
97--- softwarecenter/view/appdetailsview.py 2010-02-23 09:36:27 +0000
98+++ softwarecenter/view/appdetailsview.py 2010-03-04 12:33:23 +0000
99@@ -288,7 +288,7 @@
100 """Add message specific to this package (e.g. how many dependenies"""
101 if not self.pkg:
102 return ""
103- return self.distro.get_rdepends_text(self.cache, self.pkg, self.app.name)
104+ return self.distro.get_installation_status(self.cache, self.pkg, self.app.name)
105 def wksub_homepage(self):
106 s = _("Website")
107 return s