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

Proposed by Kiwinote
Status: Merged
Merged at revision: 2616
Proposed branch: lp:~kiwinote/software-center/bug905605
Merge into: lp:software-center
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
softwarecenter/ui/gtk3/widgets/oneconfviews.py (+1/-0)
To merge this branch: bzr merge lp:~kiwinote/software-center/bug905605
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+87257@code.launchpad.net

Description of the change

this is a consequence of http://git.gnome.org/browse/pygobject/commit/gi/overrides/Gtk.py?id=654711d0f940d7480d0f1cdb25a3dc9996f7a706
although that commit breaks existing applications the change isn't incorrect in the sense that we do declare the column type as a string so we should really ensure that we only put strings in (which is what i've done here)

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
=== modified file 'debian/changelog'
--- debian/changelog 2011-12-19 13:12:41 +0000
+++ debian/changelog 2012-01-02 15:12:26 +0000
@@ -1,3 +1,10 @@
1software-center (5.1.5) UNRELEASED; urgency=low
2
3 * softwarecenter/ui/gtk3/widgets/oneconfviews.py:
4 - ensure that hostid is always a string (as we declared) (LP: #905605)
5
6 -- Kiwinote <kiwinote@gmail.com> Mon, 02 Jan 2012 15:03:47 +0000
7
1software-center (5.1.4) precise; urgency=low8software-center (5.1.4) precise; urgency=low
29
3 [ Michael Vogt ]10 [ Michael Vogt ]
411
=== modified file 'softwarecenter/ui/gtk3/widgets/oneconfviews.py'
--- softwarecenter/ui/gtk3/widgets/oneconfviews.py 2011-09-02 03:53:36 +0000
+++ softwarecenter/ui/gtk3/widgets/oneconfviews.py 2012-01-02 15:12:26 +0000
@@ -67,6 +67,7 @@
67 return67 return
68 if hostid in self.hostids:68 if hostid in self.hostids:
69 return69 return
70 hostid = hostid or '' # bug 905605
70 self.hostids.append(hostid)71 self.hostids.append(hostid)
71 LOG.debug("register new computer: %s, %s" % (hostname, hostid))72 LOG.debug("register new computer: %s, %s" % (hostname, hostid))
72 model.append([self.default_computer_icon, hostid, hostname])73 model.append([self.default_computer_icon, hostid, hostname])

Subscribers

People subscribed via source and target branches