Merge lp:~ken-vandine/ubuntu-system-settings/lp1365646 into lp:ubuntu-system-settings

[Ken VanDine]

Don't call downloadUpdate for system updates that are already downloading (LP: #1365646)

Don't call downloadUpdate for system updates that are already downloading (LP: #1365646)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1004
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1444/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4686/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/636
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4469/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5938
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5938/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13026
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3760
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3760/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

1005. By Ken VanDine on 2014-09-10

fixed the height calculation for the ListView, it was causing a crash onModelChanged

[Sebastien Bacher (seb128)]

Thanks, could you explain why do you need to check the download mode there and what's the difference in the height computation/why the old value was leading to a segfault?

review: Needs Information

[Ken VanDine (ken-vandine)]

We don't want to tell system-image-dbus to download the system update if auto_download isn't enabled.

I'm not certain why using contentItem to get the height was causing the crash, it seemed to only happen when the system update was already downloaded, so got added to the model while the click updates were getting added. Note the system update gets prepended to the model, so maybe it has something to do with the reordering of the rows.

[Sebastien Bacher (seb128)]

thanks for the details, seems reasonable changes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1005
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1448/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4705
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/640
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5957
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5957/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13036
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3773
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3773/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-09-09 16:39:35 +0000
+++ plugins/system-update/PageComponent.qml	2014-09-10 19:35:29 +0000
@@ -283,7 +283,7 @@
                     right: parent.right
                 }
                 model: updateManager.model
-                height: contentItem.childrenRect.height
+                height: childrenRect.height
                 interactive: false
 
                 delegate: ListItem.Subtitled {

=== modified file 'plugins/system-update/system_update.cpp'
--- plugins/system-update/system_update.cpp	2014-08-27 22:00:30 +0000
+++ plugins/system-update/system_update.cpp	2014-09-10 19:35:29 +0000
@@ -206,7 +206,8 @@
     } else {
         Q_EMIT updateNotFound();
     }
-    if (downloading) {
+
+    if (!downloading && (m_downloadMode == 0)) {
         downloadUpdate();
         update->setSelected(true);
     }