Libertine

Merge lp:~larryprice/libertine/double-dialog into lp:libertine

  1. double-dialog
  2. Merge into devel
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 255
Merged at revision: 258
Proposed branch: lp:~larryprice/libertine/double-dialog
Merge into: lp:libertine
Diff against target: 32 lines (+3/-6)
1 file modified
libertine/qml/ExtraArchivesView.qml (+3/-6)
To merge this branch: bzr merge lp:~larryprice/libertine/double-dialog
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+298432@code.launchpad.net

Commit message

Prevent showing multiple error dialogs when adding arcive fails

Description of the change

Prevent showing multiple error dialogs when adding arcive fails

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:255
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/96
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/64
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/64
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/79/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/99
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/84
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/84
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/84
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/77
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/77
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/77
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/77/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/77
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/77
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/77/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/77
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/77/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/13/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libertine/qml/ExtraArchivesView.qml'
2--- libertine/qml/ExtraArchivesView.qml 2016-05-19 17:56:43 +0000
3+++ libertine/qml/ExtraArchivesView.qml 2016-06-27 14:45:15 +0000
4@@ -126,25 +126,22 @@
5 }
6
7 function addArchive(archive) {
8- var comp = Qt.createComponent("ContainerManager.qml")
9- worker = comp.createObject(mainView)
10+ var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
11 worker.finishedConfigure.connect(finishedConfigure)
12 worker.error.connect(sendAddError)
13- error.connect(mainView.error)
14 worker.configureContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer), ["--add-archive", archive])
15 }
16
17 function deleteArchive(archive) {
18- var comp = Qt.createComponent("ContainerManager.qml")
19- worker = comp.createObject(mainView)
20+ var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
21 worker.finishedConfigure.connect(finishedConfigure)
22 worker.error.connect(sendDeleteError)
23- error.connect(mainView.error)
24 worker.configureContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer), ["--delete-archive", archive])
25 }
26
27 Component.onCompleted: {
28 containerConfigList.configChanged.connect(reloadArchives)
29+ error.connect(mainView.error)
30 }
31
32 Component.onDestruction: {

Subscribers

People subscribed via source and target branches