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

[Jonas G. Drange]

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

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} {})

[Jonas G. Drange (jonas-drange)]

I've confirmed that this works on mako.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2335/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/519
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3823
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3823/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22749

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2335/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

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