Merge lp:~mvo/software-center/fix-lp994632 into lp:software-center

Proposed by Michael Vogt on 2012-05-04
Status: Superseded
Proposed branch: lp:~mvo/software-center/fix-lp994632
Merge into: lp:software-center
Diff against target: 81 lines (+27/-9)
4 files modified
debian/changelog (+10/-4)
debian/control (+1/-1)
softwarecenter/ui/gtk3/models/appstore2.py (+8/-0)
softwarecenter/ui/gtk3/views/appdetailsview.py (+8/-4)
To merge this branch: bzr merge lp:~mvo/software-center/fix-lp994632
Reviewer Review Type Date Requested Status
software-store-developers 2012-05-04 Pending
Review via email: mp+104778@code.launchpad.net

This proposal has been superseded by a proposal from 2012-05-04.

Description of the Change

A small branch that ensures that we get the right ubuntu-sso-client-gtk, see LP: #994632

To post a comment you must log in.

Unmerged revisions

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-04-30 22:27:29 +0000
3+++ debian/changelog 2012-05-04 17:20:29 +0000
4@@ -1,12 +1,18 @@
5-*** DO NOT UPLOAD YET FROM THIS BRANCH, use the lp:software-center/5.2
6- BRANCH INSTEAD until "quantal" gets the first upload ***
7-
8-software-center (5.3.0) UNRELEASED; urgency=low
9+software-center (5.2.2) UNRELEASED; urgency=low
10
11 [ Michael Vogt ]
12 * lp:~mvo/software-center/whatsnew-leak-lp985389:
13 - search filter fix for the case when the "installed-only"
14 filter leaks into subsequent searches (LP: #985389)
15+
16+ [ Gary Lasker ]
17+ * lp:~gary-lasker/software-center/fix-crash-lp969732:
18+ - need to explicitly declare the needs-refresh signal in the
19+ AppTreeStore class to prevent a crash (LP: #969732)
20+ * lp:~gary-lasker/software-center/fix-crash-lp870822:
21+ - don't crash if we don't get a pkgversion object back
22+ (LP: #870822)
23+
24
25 -- Gary Lasker <gary.lasker@canonical.com> Mon, 30 Apr 2012 18:22:04 -0400
26
27
28=== modified file 'debian/control'
29--- debian/control 2012-04-11 08:19:03 +0000
30+++ debian/control 2012-05-04 17:20:29 +0000
31@@ -41,7 +41,7 @@
32 policykit-1,
33 policykit-1-gnome | policykit-1-kde,
34 python-xdg,
35- ubuntu-sso-client (>= 0.99.6),
36+ ubuntu-sso-client-gtk,
37 python-piston-mini-client (>= 0.1+bzr29),
38 oneconf (>= 0.2.6),
39 python-debtagshw,
40
41=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
42--- softwarecenter/ui/gtk3/models/appstore2.py 2012-03-30 09:11:08 +0000
43+++ softwarecenter/ui/gtk3/models/appstore2.py 2012-05-04 17:20:29 +0000
44@@ -476,6 +476,14 @@
45 """ A treestore based application model
46 """
47
48+ __gsignals__ = {
49+ # meh, this is a signal from AppPropertiesHelper
50+ "needs-refresh": (GObject.SignalFlags.RUN_LAST,
51+ None,
52+ (str, ),
53+ ),
54+ }
55+
56 def __init__(self, db, cache, icons, icon_size=AppGenericStore.ICON_SIZE,
57 global_icon_cache=True):
58 AppGenericStore.__init__(
59
60=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
61--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-04-18 10:31:00 +0000
62+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-05-04 17:20:29 +0000
63@@ -2024,10 +2024,14 @@
64 self.app_details.pkg_state == PkgStates.INSTALLED and
65 not self.addons_manager.addons_to_install and
66 not self.addons_manager.addons_to_remove):
67- pkg = self.cache[self.app_details.pkgname].installed
68- install_size = GLib.format_size(pkg.installed_size)
69- # FIXME: this is not really a good indication of the size on disk
70- label_string += _("%s on disk") % (install_size)
71+ pkg_version = self.cache[self.app_details.pkgname].installed
72+ # we may not always get a pkg_version returned (LP: #870822),
73+ # in that case, we'll just have to display "Unknown"
74+ if pkg_version:
75+ install_size = GLib.format_size(pkg_version.installed_size)
76+ # FIXME: this is not really a good indication of the size
77+ # on disk
78+ label_string += _("%s on disk") % (install_size)
79 elif total_install_size < 0:
80 remove_size = GLib.format_size(-total_install_size)
81 label_string += _("%s to be freed") % (remove_size)

Subscribers

People subscribed via source and target branches