Ubuntu Software Center

Merge lp:~kiwinote/software-center/bug911886 into lp:software-center

  1. bug911886
  2. Merge into trunk
Proposed by Kiwinote
Status: Merged
Merged at revision: 2635
Proposed branch: lp:~kiwinote/software-center/bug911886
Merge into: lp:software-center
Diff against target: 77 lines (+13/-9)
3 files modified
debian/changelog (+5/-1)
softwarecenter/ui/gtk3/models/appstore2.py (+1/-1)
softwarecenter/ui/gtk3/panes/installedpane.py (+7/-7)
To merge this branch: bzr merge lp:~kiwinote/software-center/bug911886
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+87599@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kiwinote (kiwinote) wrote :

urgh - forgot to revert the commit from the utf8 branch before doing this commit
all is fine though - this branch'll just pull both fixes in at once

Revision history for this message
Gary Lasker (gary-lasker) wrote :

Thank you, Kiwinote!

review: Approve

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 2012-01-05 08:52:42 +0000
3+++ debian/changelog 2012-01-05 11:33:23 +0000
4@@ -1,8 +1,12 @@
5 software-center (5.1.5) UNRELEASED; urgency=low
6
7 [ Kiwinote ]
8+ * softwarecenter/ui/gtk3/models/appstore2.py:
9+ - fix TypeError in load_range (LP: #911886)
10 * softwarecenter/ui/gtk3/panes/historypane.py:
11 - change COL_PKG to an object rather than a str (LP: #905762)
12+ * softwarecenter/ui/gtk3/panes/installedpane.py:
13+ - fix utf8 oddness to make remote installed panes work
14 * softwarecenter/ui/gtk3/widgets/oneconfviews.py:
15 - ensure that hostid is always a string (as we declared) (LP: #905605)
16 * softwarecenter/ui/gtk3/widgets/thumbnail.py:
17@@ -37,7 +41,7 @@
18 * lp:~roignac/software-center/bug-632773-selectable-title:
19 - make the app title selectable (LP: #632773)
20
21- -- Gary Lasker <gary.lasker@canonical.com> Wed, 04 Jan 2012 18:42:22 -0500
22+ -- Kiwinote <kiwinote@gmail.com> Thu, 05 Jan 2012 11:23:47 +0000
23
24 software-center (5.1.4) precise; urgency=low
25
26
27=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
28--- softwarecenter/ui/gtk3/models/appstore2.py 2012-01-05 01:49:06 +0000
29+++ softwarecenter/ui/gtk3/models/appstore2.py 2012-01-05 11:33:23 +0000
30@@ -455,7 +455,7 @@
31 db = self.db.xapiandb
32 matches = self.current_matches
33
34- n_matches = len(matches)
35+ n_matches = len(matches or [])
36
37 start = indices[0]
38 end = start + step
39
40=== modified file 'softwarecenter/ui/gtk3/panes/installedpane.py'
41--- softwarecenter/ui/gtk3/panes/installedpane.py 2011-12-16 01:52:15 +0000
42+++ softwarecenter/ui/gtk3/panes/installedpane.py 2012-01-05 11:33:23 +0000
43@@ -30,7 +30,7 @@
44
45 from softwarecenter.enums import (NonAppVisibility,
46 SortMethods)
47-from softwarecenter.utils import wait_for_apt_cache_ready
48+from softwarecenter.utils import wait_for_apt_cache_ready, utf8
49 from softwarecenter.db.categories import (CategoriesParser,
50 categories_sorted_by_name)
51 from softwarecenter.ui.gtk3.models.appstore2 import (
52@@ -435,9 +435,9 @@
53 L = len(enq.matches)
54
55 if L:
56- cat_title = ngettext(u'%(amount)s item on “%(machine)s” not on this computer',
57- u'%(amount)s items on “%(machine)s” not on this computer',
58- L) % { 'amount' : L, 'machine': self.current_hostname}
59+ cat_title = utf8(ngettext(u'%(amount)s item on “%(machine)s” not on this computer',
60+ u'%(amount)s items on “%(machine)s” not on this computer',
61+ L)) % { 'amount' : L, 'machine': utf8(self.current_hostname)}
62 i += L
63 docs = enq.get_documents()
64 self.cat_docid_map["missingpkg"] = set([doc.get_docid() for doc in docs])
65@@ -457,9 +457,9 @@
66
67 L = len(enq.matches)
68 if L:
69- cat_title = ngettext(u'%(amount)s item on this computer not on “%(machine)s”',
70- u'%(amount)s items on this computer not on “%(machine)s”',
71- L) % { 'amount' : L, 'machine': self.current_hostname}
72+ cat_title = utf8(ngettext(u'%(amount)s item on this computer not on “%(machine)s”',
73+ '%(amount)s items on this computer not on “%(machine)s”',
74+ L)) % { 'amount' : L, 'machine': utf8(self.current_hostname)}
75 i += L
76 docs = enq.get_documents()
77 self.cat_docid_map["additionalpkg"] = set([doc.get_docid() for doc in docs])

Subscribers

People subscribed via source and target branches