Ubuntu Software Center

Merge lp:~roignac/software-center/bug-805969 into lp:software-center

  1. bug-805969
  2. Merge into trunk
Proposed by Vadim Rutkovsky
Status: Merged
Merged at revision: 1968
Proposed branch: lp:~roignac/software-center/bug-805969
Merge into: lp:software-center
Diff against target: 47 lines (+5/-5)
1 file modified
softwarecenter/ui/gtk/app.py (+5/-5)
To merge this branch: bzr merge lp:~roignac/software-center/bug-805969
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+68610@code.launchpad.net

Description of the change

The fix for incorrect imports for backend and db modules - fixes 'Reinstall Previous Purchases' menu item

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/ui/gtk/app.py'
2--- softwarecenter/ui/gtk/app.py 2011-07-18 22:42:21 +0000
3+++ softwarecenter/ui/gtk/app.py 2011-07-20 21:34:28 +0000
4@@ -567,7 +567,7 @@
5
6 def _available_for_me_result(self, scagent, result_list):
7 #print "available_for_me_result", result_list
8- from db.update import add_from_purchased_but_needs_reinstall_data
9+ from softwarecenter.db.update import add_from_purchased_but_needs_reinstall_data
10 available_for_me_query = add_from_purchased_but_needs_reinstall_data(
11 result_list, self.db, self.cache)
12 self.available_pane.on_previous_purchases_activated(available_for_me_query)
13@@ -683,7 +683,7 @@
14 return False
15
16 def on_menuitem_launchpad_private_ppas_activate(self, menuitem):
17- from backend.launchpad import GLaunchpad
18+ from softwarecenter.backend.launchpad import GLaunchpad
19 self.glaunchpad = GLaunchpad()
20 self.glaunchpad.connect("login-successful", self._on_lp_login)
21 from view.logindialog import LoginDialog
22@@ -692,7 +692,7 @@
23
24 def _create_buildin_sso_if_needed(self):
25 if not self.sso:
26- from backend.restfulclient import UbuntuSSOlogin
27+ from softwarecenter.backend.restfulclient import UbuntuSSOlogin
28 self.sso = UbuntuSSOlogin()
29 self.sso.connect("login-successful", self._on_sso_login)
30 def _login_via_buildin_sso(self):
31@@ -706,7 +706,7 @@
32
33 def _create_dbus_sso_if_needed(self):
34 if not self.sso:
35- from backend.login_sso import get_sso_backend
36+ from softwarecenter.backend.login_sso import get_sso_backend
37 appname = SOFTWARE_CENTER_NAME_KEYRING
38 login_text = SOFTWARE_CENTER_SSO_DESCRIPTION
39 self.sso = get_sso_backend(self.window_main.window.xid,
40@@ -719,7 +719,7 @@
41
42 def _create_scagent_if_needed(self):
43 if not self.scagent:
44- from backend.scagent import SoftwareCenterAgent
45+ from softwarecenter.backend.scagent import SoftwareCenterAgent
46 self.scagent = SoftwareCenterAgent(xid=self.window_main.window.xid)
47 self.scagent.connect("available-for-me", self._available_for_me_result)
48