ubuntu-system-settings

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

  1. lp1505663
  2. Merge into trunk
Proposed by Ken VanDine on 2015-10-29
Status: Merged
Approved by: Sebastien Bacher on 2015-10-30
Approved revision: 1548
Merged at revision: 1551
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1505663
Merge into: lp:ubuntu-system-settings
Prerequisite: lp:~gang65/ubuntu-system-settings/ubuntu-system-settings-remove-retry-button
Diff against target: 32 lines (+5/-3)
1 file modified
plugins/system-update/PageComponent.qml (+5/-3)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1505663
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration 2015-10-29 Needs Fixing on 2015-11-03
Sebastien Bacher (community) 2015-10-29 Approve on 2015-10-30
Review via email: mp+276182@code.launchpad.net

This proposal supersedes a proposal from 2015-10-20.

Commit Message

Ensure we only check for updates when NetworkingStatus.online is true

Description of the Change

Ensure we only check for updates when NetworkingStatus.online is true

To post a comment you must log in.
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

thanks, you have a console.warn() in there though, I guess it's a debug leftover?

the onClicked change also needs wrong, shouldn't we rather disable the button instead of having the action showed to the user but not doing that it should?

review: Needs Fixing
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1545
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2441/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/625
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3811/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24389

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

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/lp1505663 updated on 2015-10-29
1548. By Ken VanDine on 2015-10-29

Removed debugging output

PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1546
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2455/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4929
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/639
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4926
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4926/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24718

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1548
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2456/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/640
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4929
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4929/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24728

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

review: Needs Fixing (continuous-integration)
Sebastien Bacher (seb128) wrote :

that's better, thanks

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1548
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2462/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/646
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4980
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4980/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24830

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/system-update/PageComponent.qml'
2--- plugins/system-update/PageComponent.qml 2015-10-29 20:41:53 +0000
3+++ plugins/system-update/PageComponent.qml 2015-10-29 20:41:53 +0000
4@@ -84,7 +84,8 @@
5 onFinished: {
6 credentialsNotification.visible = false;
7 root.state = "SEARCHING";
8- UpdateManager.checkUpdates();
9+ if (NetworkingStatus.online)
10+ UpdateManager.checkUpdates();
11 }
12 }
13
14@@ -147,7 +148,7 @@
15 PropertyChanges { target: installAllButton; visible: false}
16 PropertyChanges { target: checkForUpdatesArea; visible: true}
17 PropertyChanges { target: updateNotification; visible: false}
18- PropertyChanges { target: activity; running: true}
19+ PropertyChanges { target: activity; running: NetworkingStatus.online}
20 },
21 State {
22 name: "NOUPDATES"
23@@ -179,7 +180,8 @@
24 Component.onCompleted: {
25 credentialsNotification.visible = false;
26 root.state = "SEARCHING";
27- UpdateManager.checkUpdates();
28+ if (NetworkingStatus.online)
29+ UpdateManager.checkUpdates();
30 }
31
32 onUpdateAvailableFound: {

Subscribers

People subscribed via source and target branches