ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/lp1487432 into lp:ubuntu-system-settings

  1. lp1487432
  2. Merge into trunk
Proposed by Jonas G. Drange on 2015-08-21
Status: Merged
Approved by: Ken VanDine on 2015-09-09
Approved revision: 1507
Merged at revision: 1527
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/lp1487432
Merge into: lp:ubuntu-system-settings
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/system-update/system_update.cpp (+1/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/lp1487432
Reviewer Review Type Date Requested Status
Ken VanDine 2015-08-21 Approve on 2015-09-09
PS Jenkins bot continuous-integration Needs Fixing on 2015-08-21
Review via email: mp+268741@code.launchpad.net

Commit Message

[system-update] deviceName now uses correct argument returned from system image backend.

Description of the Change

I was testing this locally when I got a device name that was “daily”. That seems like a version, not a device name. Then I got Dave Morley, who reported bug 1487432, to run [1], which is how we determine the name. That yielded [2], which looks to be correct. I then ran [1] on my desktop, which gave me [3]. “daily” is the third argument, whereas in system_update.cpp we use reply.argumentAt<2>();. I expect the bug 1487432 to be a result of the device name not being “mako”, in Dave's case, but rather “ubuntu-touch/rc-proposed/ubuntu”.

[1] gdbus call -y -d com.canonical.SystemImage -o /Service -m com.canonical.SystemImage.Info
[2] (222, 'mako', 'ubuntu-touch/rc-proposed/ubuntu', '2015-08-20 10:08:25', {'custom': '20150819', 'version': '222', 'ubuntu': '20150819', 'device': '20150819'})
[3] (0, '', 'daily', 'Unknown', @a{ss} {})

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
1=== modified file 'plugins/system-update/system_update.cpp'
2--- plugins/system-update/system_update.cpp 2015-07-13 18:26:10 +0000
3+++ plugins/system-update/system_update.cpp 2015-08-21 12:04:37 +0000
4@@ -105,7 +105,7 @@
5 reply.waitForFinished();
6 if (reply.isValid()) {
7 m_currentBuildNumber = reply.argumentAt<0>();
8- m_deviceName = reply.argumentAt<2>();
9+ m_deviceName = reply.argumentAt<1>();
10 m_lastUpdateDate = QDateTime::fromString(reply.argumentAt<3>(), Qt::ISODate);
11 m_detailedVersion = reply.argumentAt<4>();
12 Q_EMIT versionChanged();

Subscribers

People subscribed via source and target branches