Merge lp:~ken-vandine/ubuntu-system-settings/lp1365646 into lp:ubuntu-system-settings
Proposed by
Ken VanDine
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Sebastien Bacher | ||||||||
Approved revision: | 1005 | ||||||||
Merged at revision: | 1020 | ||||||||
Proposed branch: | lp:~ken-vandine/ubuntu-system-settings/lp1365646 | ||||||||
Merge into: | lp:ubuntu-system-settings | ||||||||
Diff against target: |
26 lines (+3/-2) 2 files modified
plugins/system-update/PageComponent.qml (+1/-1) plugins/system-update/system_update.cpp (+2/-1) |
||||||||
To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1365646 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Sebastien Bacher (community) | Approve | ||
Review via email:
|
Commit message
Don't call downloadUpdate for system updates that are already downloading (LP: #1365646)
Description of the change
Don't call downloadUpdate for system updates that are already downloading (LP: #1365646)
To post a comment you must log in.
FAILED: Continuous integration, rev:1004 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1444/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/4686/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 3455 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 636 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4469/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5938 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5938/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 13026 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 2857 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3760 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3760/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1444/ rebuild
http://