Merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1392051 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[system-update] remember the latest SystemUpdate downloaded and compare
the version when checking again and set updateReady appropriately. This
fixes the handling of downloaded updates when auto-download is false.

[system-update] remember the latest SystemUpdate downloaded and compare
the version when checking again and set updateReady appropriately. This
fixes the handling of downloaded updates when auto-download is false.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:946
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/9/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/rtm-lp1392051]

947. By Ken VanDine on 2014-12-16

merged rtm-14.09

948. By Ken VanDine on 2014-12-16

Set m_latestDownload after download is complete

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2014-10-27 13:17:32 +0000
+++ plugins/system-update/update_manager.cpp	2014-12-16 15:39:06 +0000
@@ -236,6 +236,8 @@
         m_model.insert(0, QVariant::fromValue(update));
         Q_EMIT modelChanged();
         Q_EMIT updateAvailableFound(update->updateState());
+        if (update->getRemoteVersion() == m_latestDownload)
+            updateDownloaded();
     }
     m_systemCheckingUpdate = false;
 
@@ -250,6 +252,7 @@
         update->setSelected(false);
         update->setUpdateState(false);
         update->setUpdateReady(true);
+        m_latestDownload = update->getRemoteVersion();
         Q_EMIT systemUpdateDownloaded();
     }
 }

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2014-10-24 20:06:13 +0000
+++ plugins/system-update/update_manager.h	2014-12-16 15:39:06 +0000
@@ -141,6 +141,7 @@
     int m_downloadMode;
     QVariantList m_model;
     Token m_token;
+    QString m_latestDownload;
 
 #ifdef TESTS
     FakeNetwork m_network;