Libertine

Merge lp:~larryprice/libertine/fix-welcome-view into lp:libertine

  1. fix-welcome-view
  2. Merge into devel
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 279
Merged at revision: 294
Proposed branch: lp:~larryprice/libertine/fix-welcome-view
Merge into: lp:libertine
Diff against target: 106 lines (+20/-22)
5 files modified
libertine/ContainerConfigList.cpp (+2/-2)
libertine/qml/ContainerOptionsDialog.qml (+1/-0)
libertine/qml/ContainersView.qml (+0/-4)
libertine/qml/WelcomeView.qml (+2/-2)
tools/libertine-container-manager (+15/-14)
To merge this branch: bzr merge lp:~larryprice/libertine/fix-welcome-view
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+303612@code.launchpad.net

Commit message

Creating the first container moves user to ContainersView screen.

Description of the change

After initializing a create, user should be automatically pushed forward to Containers View.

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

PASSED: Continuous integration, rev:279
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/106/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/298
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/247
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/247
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/247
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/247
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/247
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/247
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/223/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/300
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/284
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/284
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/284
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/277
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/277/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/277
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/277/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/277
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/277/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/277
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/277/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/277
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/277/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/277
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/277/artifact/output/*zip*/output.zip

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

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

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libertine/ContainerConfigList.cpp'
--- libertine/ContainerConfigList.cpp 2016-06-07 18:45:30 +0000
+++ libertine/ContainerConfigList.cpp 2016-08-22 18:24:14 +0000
@@ -506,6 +506,7 @@
506load_config()506load_config()
507{507{
508 QFile config_file(config_->containers_config_file_name());508 QFile config_file(config_->containers_config_file_name());
509 flock(config_file.handle(), LOCK_EX);
509510
510 if (config_file.exists())511 if (config_file.exists())
511 {512 {
@@ -517,9 +518,7 @@
517 {518 {
518 QJsonParseError parse_error;519 QJsonParseError parse_error;
519520
520 flock(config_file.handle(), LOCK_EX);
521 QJsonDocument json = QJsonDocument::fromJson(config_file.readAll(), &parse_error);521 QJsonDocument json = QJsonDocument::fromJson(config_file.readAll(), &parse_error);
522 flock(config_file.handle(), LOCK_UN);
523522
524 if (parse_error.error)523 if (parse_error.error)
525 {524 {
@@ -543,4 +542,5 @@
543 }542 }
544 }543 }
545 }544 }
545 flock(config_file.handle(), LOCK_UN);
546}546}
547547
=== modified file 'libertine/qml/ContainerOptionsDialog.qml'
--- libertine/qml/ContainerOptionsDialog.qml 2016-07-15 18:39:58 +0000
+++ libertine/qml/ContainerOptionsDialog.qml 2016-08-22 18:24:14 +0000
@@ -79,6 +79,7 @@
79 width: (parent.width - parent.spacing) / 279 width: (parent.width - parent.spacing) / 2
80 onClicked: {80 onClicked: {
81 createContainer()81 createContainer()
82 welcomeView.createInitialized()
82 PopupUtils.close(containerOptionsDialog)83 PopupUtils.close(containerOptionsDialog)
83 }84 }
84 }85 }
8586
=== modified file 'libertine/qml/ContainersView.qml'
--- libertine/qml/ContainersView.qml 2016-08-15 15:59:56 +0000
+++ libertine/qml/ContainersView.qml 2016-08-22 18:24:14 +0000
@@ -146,8 +146,4 @@
146 mainView.error(i18n.tr("Container Unavailable"), i18n.tr("This container has been destroyed and is no longer valid. You have been returned to the containers overview."))146 mainView.error(i18n.tr("Container Unavailable"), i18n.tr("This container has been destroyed and is no longer valid. You have been returned to the containers overview."))
147 }147 }
148 }148 }
149
150 function showPasswordDialog(enableMultiarch, containerName) {
151 PopupUtils.open(Qt.resolvedUrl("ContainerPasswordDialog.qml"), null, {"enableMultiarch": enableMultiarch, "containerName": containerName})
152 }
153}149}
154150
=== modified file 'libertine/qml/WelcomeView.qml'
--- libertine/qml/WelcomeView.qml 2016-07-15 18:39:58 +0000
+++ libertine/qml/WelcomeView.qml 2016-08-22 18:24:14 +0000
@@ -72,7 +72,7 @@
72 }72 }
73 }73 }
7474
75 function showPasswordDialog(enableMultiarch, containerName) {75 function createInitialized() {
76 PopupUtils.open(Qt.resolvedUrl("ContainerPasswordDialog.qml"), null, {"enableMultiarch": enableMultiarch, "containerName": containerName})76 pageStack.push(Qt.resolvedUrl("ContainersView.qml"))
77 }77 }
78}78}
7979
=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager 2016-07-29 17:58:15 +0000
+++ tools/libertine-container-manager 2016-08-22 18:24:14 +0000
@@ -274,20 +274,21 @@
274 self.containers_config.merge_container_config_files(args.file)274 self.containers_config.merge_container_config_files(args.file)
275275
276 def fix_integrity(self, args):276 def fix_integrity(self, args):
277 for container in self.containers_config.container_list['containerList']:277 if 'containerList' in self.containers_config.container_list:
278 if 'installStatus' not in container or container['installStatus'] != 'ready':278 for container in self.containers_config.container_list['containerList']:
279 self.destroy_container_by_id(container['id'])279 if 'installStatus' not in container or container['installStatus'] != 'ready':
280 continue280 self.destroy_container_by_id(container['id'])
281 LibertineContainer(container['id']).exec_command('dpkg --configure -a')281 continue
282282 LibertineContainer(container['id']).exec_command('dpkg --configure -a')
283 for package in container['installedApps']:283
284 if package['appStatus'] != 'installed':284 for package in container['installedApps']:
285 self.remove_package_by_name(container['id'], package['packageName'])285 if package['appStatus'] != 'installed':
286286 self.remove_package_by_name(container['id'], package['packageName'])
287 if 'extraArchives' in container:287
288 for archive in container['extraArchives']:288 if 'extraArchives' in container:
289 if archive['archiveStatus'] != 'installed':289 for archive in container['extraArchives']:
290 self.delete_archive_by_name(container['id'], archive['archiveName'])290 if archive['archiveStatus'] != 'installed':
291 self.delete_archive_by_name(container['id'], archive['archiveName'])
291292
292 def set_default(self, args):293 def set_default(self, args):
293 if args.clear:294 if args.clear:

Subscribers

People subscribed via source and target branches