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

Proposed by Kiwinote on 2012-03-20
Status: Merged
Merged at revision: 2904
Proposed branch: lp:~kiwinote/software-center/bug960260
Merge into: lp:software-center
Diff against target: 29 lines (+8/-3)
2 files modified
debian/changelog (+7/-0)
softwarecenter/ui/gtk3/widgets/apptreeview.py (+1/-3)
To merge this branch: bzr merge lp:~kiwinote/software-center/bug960260
Reviewer Review Type Date Requested Status
Michael Vogt 2012-03-20 Approve on 2012-03-20
Review via email: mp+98451@code.launchpad.net

Description of the change

sorry, messed up the fix for bug 959530 earlier today - this branch will restore normal behaviour

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks! That looks good.

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-03-20 13:19:27 +0000
3+++ debian/changelog 2012-03-20 16:39:21 +0000
4@@ -1,3 +1,10 @@
5+software-center (5.1.14) UNRELEASED; urgency=low
6+
7+ * softwarecenter/ui/gtk3/apptreeview.py:
8+ - fix UnboundLocalError in expand_path() (LP: #960260)
9+
10+ -- Kiwinote <kiwinote@gmail.com> Tue, 20 Mar 2012 16:30:53 +0000
11+
12 software-center (5.1.13) precise; urgency=low
13
14 [ Anthony Lenton ]
15
16=== modified file 'softwarecenter/ui/gtk3/widgets/apptreeview.py'
17--- softwarecenter/ui/gtk3/widgets/apptreeview.py 2012-03-20 10:00:06 +0000
18+++ softwarecenter/ui/gtk3/widgets/apptreeview.py 2012-03-20 16:39:21 +0000
19@@ -143,9 +143,7 @@
20 self.expanded_path = path
21
22 if old is not None:
23- res = self.get_visible_range()
24- if res:
25- start, end = res
26+ start, end = self.get_visible_range() or (None, None)
27 if (start and start.compare(old) != -1) or \
28 (end and end.compare(old) != 1):
29 self._needs_collapse.append(old)

Subscribers

People subscribed via source and target branches