Merge lp:~laney/ubiquity/1572793 into lp:ubiquity

Proposed by Iain Lane
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 6441
Merged at revision: 6441
Proposed branch: lp:~laney/ubiquity/1572793
Merge into: lp:ubiquity
Diff against target: 25 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
ubiquity/misc.py (+1/-1)
To merge this branch: bzr merge lp:~laney/ubiquity/1572793
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+292543@code.launchpad.net

Description of the change

misc.py: Ask for the 'State' property instead of 'state'. Fixes display of wireless page. (LP: #1572793)

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good!

review: Approve
Revision history for this message
Iain Lane (laney) wrote :

BTW for future people - this was because NM ported from dbus-glib to GDBus between wily and xenial, and dbus-glib has a misfeature where it will return the value if you miscapitalise the first letter of a property, instead of erroring. GDBus doesn't do that, so the misspelling of 'State' as 'state' was correctly causing a check in the wireless page to fail, which took an error path that made Ubiquity not load the page.

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 2016-04-20 16:14:44 +0000
3+++ debian/changelog 2016-04-21 15:21:58 +0000
4@@ -1,3 +1,10 @@
5+ubiquity (2.21.64) UNRELEASED; urgency=medium
6+
7+ * misc.py: Ask for the 'State' property instead of 'state'. Fixes display
8+ of wireless page. (LP: #1572793)
9+
10+ -- Iain Lane <iain@orangesquash.org.uk> Thu, 21 Apr 2016 16:05:15 +0100
11+
12 ubiquity (2.21.63) xenial; urgency=medium
13
14 * Automatic update of included source packages: user-setup
15
16=== modified file 'ubiquity/misc.py'
17--- ubiquity/misc.py 2014-11-26 00:12:18 +0000
18+++ ubiquity/misc.py 2016-04-21 15:21:58 +0000
19@@ -824,7 +824,7 @@
20 import dbus
21 bus = dbus.SystemBus()
22 manager = bus.get_object(NM, '/org/freedesktop/NetworkManager')
23- state = get_prop(manager, NM, 'state')
24+ state = get_prop(manager, NM, 'State')
25 return state == NM_STATE_CONNECTED_GLOBAL
26
27

Subscribers

People subscribed via source and target branches

to status/vote changes: