Ubuntu Software Center

Merge lp:~kiwinote/software-center/init-without-dbus into lp:software-center

  1. init-without-dbus
  2. Merge into trunk
Proposed by Kiwinote
Status: Merged
Merged at revision: 1027
Proposed branch: lp:~kiwinote/software-center/init-without-dbus
Merge into: lp:software-center
Diff against target: 77 lines (+16/-5)
5 files modified
debian/changelog (+13/-0)
softwarecenter/__init__.py (+0/-2)
softwarecenter/db/application.py (+1/-1)
softwarecenter/db/database.py (+1/-1)
test/test_appview.py (+1/-1)
To merge this branch: bzr merge lp:~kiwinote/software-center/init-without-dbus
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+33227@code.launchpad.net

Description of the change

see bug report for details

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 'debian/changelog'
2--- debian/changelog 2010-08-13 14:55:27 +0000
3+++ debian/changelog 2010-08-20 15:17:44 +0000
4@@ -1,3 +1,16 @@
5+software-center (2.1.11) UNRELEASED; urgency=low
6+
7+ [ Kiwinote ]
8+ * softwarecenter/__init__.py:
9+ - don't import Application
10+ * softwarecenter/db/application.py:
11+ - only import get_install_backend when we actually need it (LP: #620011)
12+ * softwarecenter/db/database.py,
13+ test/test_appview.py:
14+ - import Application from the correct location
15+
16+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Aug 2010 16:46:13 +0200
17+
18 software-center (2.1.10) maverick; urgency=low
19
20 [ Kiwinote ]
21
22=== modified file 'softwarecenter/__init__.py'
23--- softwarecenter/__init__.py 2010-07-08 08:11:34 +0000
24+++ softwarecenter/__init__.py 2010-08-20 15:17:44 +0000
25@@ -17,5 +17,3 @@
26 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
27
28 import locale
29-
30-from db.application import Application
31
32=== modified file 'softwarecenter/db/application.py'
33--- softwarecenter/db/application.py 2010-08-13 14:25:11 +0000
34+++ softwarecenter/db/application.py 2010-08-20 15:17:44 +0000
35@@ -28,7 +28,6 @@
36 from gettext import gettext as _
37 from mimetypes import guess_type
38 from softwarecenter.apt.apthistory import get_apt_history
39-from softwarecenter.backend import get_install_backend
40 from softwarecenter.distro import get_distro
41 from softwarecenter.enums import *
42 from softwarecenter.utils import *
43@@ -120,6 +119,7 @@
44 self._cache = self._db._aptcache
45 self._distro = get_distro()
46 self._history = get_apt_history()
47+ from softwarecenter.backend import get_install_backend
48 self._backend = get_install_backend()
49 # FIXME: why two error states ?
50 self._error = None
51
52=== modified file 'softwarecenter/db/database.py'
53--- softwarecenter/db/database.py 2010-08-12 13:08:06 +0000
54+++ softwarecenter/db/database.py 2010-08-20 15:17:44 +0000
55@@ -23,7 +23,7 @@
56 import re
57 import string
58 import xapian
59-from softwarecenter import Application
60+from softwarecenter.db.application import Application
61
62 from softwarecenter.utils import *
63 from softwarecenter.enums import *
64
65=== modified file 'test/test_appview.py'
66--- test/test_appview.py 2010-08-09 14:17:41 +0000
67+++ test/test_appview.py 2010-08-20 15:17:44 +0000
68@@ -8,8 +8,8 @@
69 import unittest
70 import shutil
71
72-from softwarecenter import Application
73 from softwarecenter.apt.aptcache import AptCache
74+from softwarecenter.db.application import Application
75 from softwarecenter.db.database import StoreDatabase
76 from softwarecenter.view.appview import AppStore
77 from softwarecenter.enums import *

Subscribers

People subscribed via source and target branches