Ubuntu Software Center

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

  1. 946393
  2. Merge into trunk
Proposed by Michael Vogt
Status: Merged
Merged at revision: 2936
Proposed branch: lp:~mvo/software-center/946393
Merge into: lp:software-center
Diff against target: 49 lines (+7/-7)
2 files modified
softwarecenter/ui/gtk3/panes/availablepane.py (+3/-5)
softwarecenter/ui/qml/pkglist.py (+4/-2)
To merge this branch: bzr merge lp:~mvo/software-center/946393
Reviewer Review Type Date Requested Status
Kiwinote Approve
Review via email: mp+100094@code.launchpad.net

Description of the change

This fixes the leftover API transition from InstallBackend.{install,remove} to take a application object instead of "pkgname", "appname".

To post a comment you must log in.
Revision history for this message
Kiwinote (kiwinote) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
2--- softwarecenter/ui/gtk3/panes/availablepane.py 2012-03-22 23:32:06 +0000
3+++ softwarecenter/ui/gtk3/panes/availablepane.py 2012-03-30 09:50:29 +0000
4@@ -487,8 +487,7 @@
5 '''
6 Function that installs all applications displayed in the pane.
7 '''
8- pkgnames = []
9- appnames = []
10+ apps = []
11 iconnames = []
12 self.action_bar.remove_button(ActionButtons.INSTALL)
13 for doc in self.enquirer.get_documents():
14@@ -496,11 +495,10 @@
15 if (pkgname in self.cache and
16 not self.cache[pkgname].is_installed and
17 pkgname not in self.backend.pending_transactions):
18- pkgnames.append(pkgname)
19- appnames.append(self.db.get_appname(doc))
20+ apps.append(self.db.get_application(doc))
21 # add iconnames
22 iconnames.append(self.db.get_iconname(doc))
23- self.backend.install_multiple(pkgnames, appnames, iconnames)
24+ self.backend.install_multiple(apps, iconnames)
25
26 def set_state(self, nav_item):
27 pass
28
29=== modified file 'softwarecenter/ui/qml/pkglist.py'
30--- softwarecenter/ui/qml/pkglist.py 2012-03-07 20:08:53 +0000
31+++ softwarecenter/ui/qml/pkglist.py 2012-03-30 09:50:29 +0000
32@@ -146,13 +146,15 @@
33 def installPackage(self, pkgname):
34 appname = ""
35 iconname = ""
36- self.backend.install(pkgname, appname, iconname)
37+ app = Application(appname, pkgname)
38+ self.backend.install(app, iconname)
39
40 @pyqtSlot(str)
41 def removePackage(self, pkgname):
42 appname = ""
43 iconname = ""
44- self.backend.remove(pkgname, appname, iconname)
45+ app = Application(appname, pkgname)
46+ self.backend.remove(app, iconname)
47
48 # searchQuery property (for qml )
49 def getSearchQuery(self):

Subscribers

People subscribed via source and target branches