Merge lp:~townsend/libertine/1.0.1 into lp:libertine/trunk

[Christopher Townsend]

* Allow an explicitly set distro during the create operation if it matches the host's distro even if the distro is technically end-of-life. (LP: #1569397)
* More Libertine GUI improvements.
* Check to make sure a subcommand was given and if not, print out the usage. (LP: #1539104)
* Check to see if CLI and GUI is ran using sudo and if so, print a message and exit. (LP: #1570548)
* Catch runtime errors raised when starting a container so a crash file is not generated and to tell the GUI that there was an error so the user can be presented a proper notification. (LP: #1539105)
* Use shutil.which() instead of hardcoded path for detecting if proot is on the system. Fixes alternate $PATH locations such as in a snap. (LP: #1572591)
* Add a 'merge-configs' command to l-c-m which allows merging a specified ContainersConfig.json file with the existing config file. (LP: #1566391)
* Have the Puritine click linking occur before Unity 8 is started to avoid having a 0-byte ContainersConfig.json file from being created. (LP: #1573266)
* Fixing infinite package removal on error caused by bad apt command and variable access. (LP: #1573201)

[Stephen M. Webb (bregma)]

OK, I se nothing nefarious here.

review: Approve

=== modified file 'data/puritine-click.conf'
--- data/puritine-click.conf	2016-03-02 13:23:42 +0000
+++ data/puritine-click.conf	2016-04-25 17:15:41 +0000
@@ -1,6 +1,6 @@
 description "Puritine Click chroot linking"
 
-start on started unity8
+start on starting unity8
 
 script
 PACKAGE_PATH=`click pkgdir com.ubuntu.puritine`
@@ -14,10 +14,15 @@
 		ln -s $CHROOT_PATH/rootfs $HOME/.cache/libertine-container/$CONTAINER_NAME/rootfs
 	fi
 
-	# Link the container config
-	if [ ! -L $HOME/.local/share/libertine/ContainersConfig.json ] ; then
+	# Copy or merge the container config files
+	if [ ! -e $HOME/.local/share/libertine/ContainersConfig.json ] ; then
 		mkdir -p $HOME/.local/share/libertine/
-		ln -s $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
+		cp $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
+	elif [ -L $HOME/.local/share/libertine/ContainersConfig.json ] ; then
+		rm $HOME/.local/share/libertine/ContainersConfig.json
+		cp $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json $HOME/.local/share/libertine/ContainersConfig.json
+	else
+		libertine-container-manager merge-configs -f $PACKAGE_PATH/libertine-config/libertine/ContainersConfig.json    
 	fi
 
 	# Create and copy the user-data dir from the click package
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-04-11 16:05:03 +0000
+++ debian/changelog	2016-04-25 17:15:41 +0000
@@ -1,3 +1,29 @@
+libertine (1.0.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Allow an explicitly set distro during the create operation if it matches the
+    host's distro even if the distro is technically end-of-life. (LP: #1569397)
+  * More Libertine GUI improvements.
+  * Check to make sure a subcommand was given and if not, print out the usage.
+    (LP: #1539104)
+  * Check to see if CLI and GUI is ran using sudo and if so, print a message and
+    exit. (LP: #1570548)
+  * Catch runtime errors raised when starting a container so a crash file is not
+    generated and to tell the GUI that there was an error so the user can be
+    presented a proper notification. (LP: #1539105)
+  * Use shutil.which() instead of hardcoded path for detecting if proot is on the
+    system. Fixes alternate $PATH locations such as in a snap. (LP: #1572591)
+  * Add a 'merge-configs' command to l-c-m which allows merging a specified
+    ContainersConfig.json file with the existing config file. (LP: #1566391)
+  * Have the Puritine click linking occur before Unity 8 is started to avoid having
+    a 0-byte ContainersConfig.json file from being created. (LP: #1573266)
+
+  [ Larry Price ]
+  * Fixing infinite package removal on error caused by bad apt command and variable
+    access. (LP: #1573201)
+
+ -- Chris Townsend <[e-mail]>  Mon, 25 Apr 2016 12:49:22 -0400
+
 libertine (1.0.0+16.04.20160411-0ubuntu1) xenial; urgency=medium
 
   [ Chris Townsend ]
 
=== modified file 'libertine/ContainerConfig.cpp'
--- libertine/ContainerConfig.cpp	2016-03-10 21:33:25 +0000
+++ libertine/ContainerConfig.cpp	2016-04-25 17:15:41 +0000
@@ -3,7 +3,7 @@
  * @brief Libertine Manager containers configuration module
  */
 /*
- * Copyright 2015 Canonical Ltd
+ * Copyright 2015-2016 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -147,6 +147,7 @@
     { QObject::tr("new"),          ContainerConfig::InstallStatus::New        },
     { QObject::tr("installing"),   ContainerConfig::InstallStatus::Installing },
     { QObject::tr("ready"),        ContainerConfig::InstallStatus::Ready      },
+    { QObject::tr("updating"),     ContainerConfig::InstallStatus::Updating   },
     { QObject::tr("removing"),     ContainerConfig::InstallStatus::Removing   },
     { QObject::tr("removed"),      ContainerConfig::InstallStatus::Removed    },
     { QObject::tr("failed"),       ContainerConfig::InstallStatus::Failed     },
 
=== modified file 'libertine/ContainerConfig.h'
--- libertine/ContainerConfig.h	2016-03-10 21:33:25 +0000
+++ libertine/ContainerConfig.h	2016-04-25 17:15:41 +0000
@@ -3,7 +3,7 @@
  * @brief Libertine Manager containers configuration module
  */
 /*
- * Copyright 2015 Canonical Ltd
+ * Copyright 2015-2016 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -88,7 +88,7 @@
 public:
   /** The container's current install state. */
   enum class InstallStatus
-  { New, Installing, Ready, Removing, Removed, Failed };
+  { New, Installing, Ready, Updating, Removing, Removed, Failed };
 
 
 public:
 
=== modified file 'libertine/ContainerManager.cpp'
--- libertine/ContainerManager.cpp	2016-04-01 17:48:28 +0000
+++ libertine/ContainerManager.cpp	2016-04-25 17:15:41 +0000
@@ -3,7 +3,7 @@
  * @brief Threaded Libertine container manager
  */
 /*
- * Copyright 2015 Canonical Ltd
+ * Copyright 2015-2016 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -289,7 +289,7 @@
     result = false;
   }
 
-  emit finishedInstall(result, QString(error_msg));
+  emit finishedInstall(package_name, result, QString(error_msg));
   emit finished();
   quit();
 }
@@ -319,7 +319,7 @@
     result = false;
   }
 
-  emit finishedRemove(result, QString(error_msg));
+  emit finishedRemove(package_name, result, QString(error_msg));
   emit finished();
   quit();
 }
 
=== modified file 'libertine/ContainerManager.h'
--- libertine/ContainerManager.h	2016-03-16 19:56:23 +0000
+++ libertine/ContainerManager.h	2016-04-25 17:15:41 +0000
@@ -3,7 +3,7 @@
  * @brief Threaded Libertine container manager
  */
 /*
- * Copyright 2015 Canonical Ltd
+ * Copyright 2015-2016 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -150,8 +150,8 @@
   void dataListChanged();
   void finished();
   void finishedDestroy(QString const& container_id);
-  void finishedInstall(bool result, QString const& error_msg);
-  void finishedRemove(bool result, QString const& error_msg);
+  void finishedInstall(QString const& package_name, bool result, QString const& error_msg);
+  void finishedRemove(QString const& package_name, bool result, QString const& error_msg);
   void finishedSearch(bool result, QList<QString> packageList);
   void finishedCommand(QString const& command_output);
   void finishedConfigure(bool result, QString const& error_msg);
 
=== modified file 'libertine/main.cpp'
--- libertine/main.cpp	2015-05-13 13:42:12 +0000
+++ libertine/main.cpp	2016-04-25 17:15:41 +0000
@@ -19,10 +19,18 @@
 #include "libertine/config.h"
 #include "libertine/libertine.h"
 
+#include <unistd.h>
+#include <QtCore/QDebug>
 
 int
 main(int argc, char* argv[])
 {
+  if (!geteuid())
+  {
+    qWarning() << "Please do not run " LIBERTINE_APPLICATION_NAME " using \'sudo\'.";
+    exit(1);
+  }
+
   Libertine app(argc, argv);
   return app.exec();
 }
 
=== removed file 'libertine/qml/ContainerApps.qml'
--- libertine/qml/ContainerApps.qml	2015-07-09 15:22:37 +0000
+++ libertine/qml/ContainerApps.qml	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/**
- * @file ContainerApps.qml
- * @brief Libertine container apps data source
- */
-/*
- * Copyright 2015 Canonical Ltd
- *
- * Libertine is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3, as published by the
- * Free Software Foundation.
- *
- * Libertine is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-
-Item {
-    function are_apps_installed(containerId) {
-        var documentIds = {}
-
-        return documentIds.length > 0
-    }
-}
 
=== modified file 'libertine/qml/ContainerInfoView.qml'
--- libertine/qml/ContainerInfoView.qml	2016-04-07 12:45:29 +0000
+++ libertine/qml/ContainerInfoView.qml	2016-04-25 17:15:41 +0000
@@ -25,7 +25,7 @@
 
 Page {
     id: containerInfoView
-    title: i18n.tr("Container information for %1").arg(mainView.currentContainer)
+    title: i18n.tr("Container information for %1").arg(containerConfigList.getContainerName(mainView.currentContainer))
     property string currentContainer: mainView.currentContainer
     property string containerDistroText: containerConfigList.getContainerDistro(currentContainer)
     property string containerNameText: containerConfigList.getContainerName(currentContainer)
 
=== modified file 'libertine/qml/ContainersView.qml'
--- libertine/qml/ContainersView.qml	2016-03-16 19:56:23 +0000
+++ libertine/qml/ContainersView.qml	2016-04-25 17:15:41 +0000
@@ -45,21 +45,25 @@
         model: containerConfigList
 
         delegate: ListItem {
+            Label {
+                text: name
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                }
+            }
             ActivityIndicator {
                 id: containerActivity
-                anchors.verticalCenter: parent.verticalCenter
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
                 visible: (installStatus === i18n.tr("installing") ||
                           installStatus === i18n.tr("removing")) ? true : false
                 running: containerActivity.visible
             }
-            Label {
-                text: name
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: containerActivity.running ? containerActivity.right : parent.left
-                    leftMargin: units.gu(2)
-                }
-            }
 
             leadingActions: ListItemActions {
                 actions: [
@@ -94,6 +98,8 @@
                         iconName: "edit"
                         text: i18n.tr("edit")
                         description: i18n.tr("Container Apps")
+                        visible: (installStatus === i18n.tr("ready") ||
+                                  installStatus === i18n.tr("updating")) ? true : false
                         onTriggered: {
                             mainView.currentContainer = containerId
                             containerAppsList.setContainerApps(mainView.currentContainer)
 
=== modified file 'libertine/qml/ExtraArchivesView.qml'
--- libertine/qml/ExtraArchivesView.qml	2016-03-10 21:33:25 +0000
+++ libertine/qml/ExtraArchivesView.qml	2016-04-25 17:15:41 +0000
@@ -72,23 +72,28 @@
     UbuntuListView {
         id: extraArchiveList
         anchors.fill: parent
+        visible: !containerArchivesList.empty() ? true : false
         model: containerArchivesList
         delegate: ListItem {
+            Label {
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                }
+                text: archiveName
+            }
             ActivityIndicator {
                 id: extraArchiveActivity
-                anchors.verticalCenter: parent.verticalCenter
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
                 visible: (archiveStatus === i18n.tr("installing") ||
                           archiveStatus === i18n.tr("removing")) ? true : false
                 running: extraArchiveActivity.visible
             }
-            Label {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: extraArchiveActivity.running ? extraArchiveActivity.right : parent.left
-                    leftMargin: units.gu(2)
-                }
-                text: archiveName
-            }
             leadingActions: ListItemActions {
                 actions: [
                     Action {
@@ -104,6 +109,16 @@
         }
     }
 
+     Label {
+        id: emptyLabel
+        anchors.centerIn: parent
+        visible: !extraArchiveList.visible  ? true : false
+        wrapMode: Text.Wrap
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
+        text: i18n.tr("No additional archives and PPA's have been added")
+    }
+
     function addArchive(archive) {
         var comp = Qt.createComponent("ContainerManager.qml")
         worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
@@ -154,6 +169,8 @@
 
     function reloadArchives() {
         containerArchivesList.setContainerArchives(mainView.currentContainer)
+
+        extraArchiveList.visible = !containerArchivesList.empty() ? true : false
     }
 
     function finishedConfigure(result, error_msg) {
 
=== modified file 'libertine/qml/HomeView.qml'
--- libertine/qml/HomeView.qml	2016-04-08 20:16:41 +0000
+++ libertine/qml/HomeView.qml	2016-04-25 17:15:41 +0000
@@ -24,7 +24,7 @@
 
 Page {
     id: homeView
-    title: i18n.tr("Classic Apps - %1").arg(mainView.currentContainer)
+    title: i18n.tr("Classic Apps - %1").arg(containerConfigList.getContainerName(mainView.currentContainer))
 
     head.actions: [
         Action {
@@ -99,15 +99,15 @@
 	ActionSelectionPopover {
 	    actions: ActionList {
 		Action {
-		    text: i18n.tr("Configure Container")
+		    text: i18n.tr("Manage Container")
 		    onTriggered: {
-                        pageStack.push(Qt.resolvedUrl("ConfigureContainer.qml"))
+                        pageStack.push(Qt.resolvedUrl("ManageContainer.qml"))
                     }
 		}
                 Action {
-                    text: i18n.tr("Update Container")
+                    text: i18n.tr("Container Information")
                     onTriggered: {
-                        updateContainer()
+                        pageStack.push(Qt.resolvedUrl("ContainerInfoView.qml"))
                     }
                 }
 		Action {
@@ -159,27 +159,35 @@
 
     function reloadAppList() {
         containerAppsList.setContainerApps(mainView.currentContainer)
+
+        appsList.visible = !containerAppsList.empty()  ? true : false
     }
 
     UbuntuListView {
+        id: appsList
         anchors.fill: parent
         model: containerAppsList
+        visible: !containerAppsList.empty()  ? true : false
         delegate: ListItem {
+            Label {
+                text: packageName
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                }
+            }
             ActivityIndicator {
                 id: appActivity
-                anchors.verticalCenter: parent.verticalCenter
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
                 visible: (appStatus === i18n.tr("installing") ||
                           appStatus === i18n.tr("removing")) ? true : false
                 running: appActivity.visible
             }
-            Label {
-                text: packageName
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: appActivity.running ? appActivity.right : parent.left
-                    leftMargin: units.gu(2)
-                }
-            }
             leadingActions: ListItemActions {
                 actions: [
                     Action {
@@ -189,7 +197,6 @@
                         onTriggered: {
                             mainView.currentPackage = packageName
                             removePackage(packageName)
-                            pageStack.push(Qt.resolvedUrl("PackageInfoView.qml"))
                         }
                     }
                 ]
@@ -210,12 +217,14 @@
         }
     }
 
-    function updateContainer() {
-        var comp = Qt.createComponent("ContainerManager.qml")
-        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Update,
-                                                  "containerId": mainView.currentContainer,
-                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer)})
-        worker.start()
+    Label {
+        id: emptyLabel
+        anchors.centerIn: parent
+        visible: !appsList.visible
+        wrapMode: Text.Wrap
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
+        text: i18n.tr("No packages are installed")
     }
 
     function installPackage(package_name) {
@@ -224,6 +233,7 @@
                                                   "containerId": mainView.currentContainer,
                                                   "containerType": containerConfigList.getContainerType(mainView.currentContainer),
                                                   "data": package_name})
+        worker.finishedInstall.connect(mainView.packageInstallFinished)
         worker.start()
     }
 
@@ -233,6 +243,7 @@
                                                   "containerId": mainView.currentContainer,
                                                   "containerType": containerConfigList.getContainerType(mainView.currentContainer),
                                                   "data": packageName})
+        worker.finishedRemove.connect(mainView.packageRemoveFinished)
         worker.start()
     }
 }
 
=== renamed file 'libertine/qml/ConfigureContainer.qml' => 'libertine/qml/ManageContainer.qml'
--- libertine/qml/ConfigureContainer.qml	2016-04-07 20:39:10 +0000
+++ libertine/qml/ManageContainer.qml	2016-04-25 17:15:41 +0000
@@ -1,6 +1,6 @@
 /**
- * @file ConfigureContainer.qml
- * @brief Libertine configure container view
+ * @file ManageContainer.qml
+ * @brief Libertine manage container view
  */
 /*
  * Copyright 2016 Canonical Ltd
@@ -23,8 +23,8 @@
 
 
 Page {
-    id: configureView
-    title: i18n.tr("Configure %1").arg(mainView.currentContainer)
+    id: manageView
+    title: i18n.tr("Manage %1").arg(containerConfigList.getContainerName(mainView.currentContainer))
 
     Column {
         anchors.left: parent.left
@@ -63,5 +63,54 @@
                 pageStack.push(Qt.resolvedUrl("ExtraArchivesView.qml"))
             }
         }
+
+        ListItem.Standard {
+            control: Button {
+                id: updateButton
+                text: i18n.tr("Update…")
+                visible: (containerConfigList.getContainerStatus(mainView.currentContainer) === i18n.tr("ready")) ? true : false
+                onClicked: {
+                    updateContainer()
+                }
+            }
+            ActivityIndicator {
+                id: updateActivity
+                anchors {
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
+                visible: (containerConfigList.getContainerStatus(mainView.currentContainer) === i18n.tr("updating")) ? true : false
+                running: updateActivity.visible
+            }
+            text: i18n.tr("Update container")
+        }   
+    }
+
+    Component.onCompleted: {
+        containerConfigList.configChanged.connect(updateStatus)
+    }
+
+    Component.onDestruction: {
+        containerConfigList.configChanged.disconnect(updateStatus)
+    }
+
+    function updateContainer() {
+        var comp = Qt.createComponent("ContainerManager.qml")
+        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Update,
+                                                  "containerId": mainView.currentContainer,
+                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer)})
+        worker.start()
+    }
+
+    function updateStatus() {
+        if (containerConfigList.getContainerStatus(mainView.currentContainer) === i18n.tr("updating")) {
+            updateButton.visible = false
+            updateActivity.visible = true
+        }
+        else if (containerConfigList.getContainerStatus(mainView.currentContainer) === i18n.tr("ready")) {
+            updateButton.visible = true
+            updateActivity.visible = false
+        }
     }
 }
 
=== modified file 'libertine/qml/PackageInfoView.qml'
--- libertine/qml/PackageInfoView.qml	2016-04-07 19:17:30 +0000
+++ libertine/qml/PackageInfoView.qml	2016-04-25 17:15:41 +0000
@@ -29,10 +29,8 @@
     property string currentContainer: mainView.currentContainer
     property var currentPackage: mainView.currentPackage
     property var statusText: containerConfigList.getAppStatus(currentContainer, currentPackage)
-    property var failureReasonText: ""
     property var packageVersionText: i18n.tr("Obtaining package version…")
     property var worker: null
-    property var install_signal: null
 
 
     Flickable {
@@ -60,26 +58,10 @@
                     text: statusText
                 }
             }
-
-            ListItem.Standard {
-                id: failureReason
-                text: i18n.tr("Failure reason")
-                visible: false
-                control: Label {
-                    text: failureReasonText
-                    wrapMode: Text.Wrap
-                    width: parent.parent.width/2
-                    horizontalAlignment: Qt.AlignRight
-                    onHeightChanged: updateFailureReasonHeight()
-                }
-            }
         }
     }
 
     Component.onCompleted: {
-        if (install_signal) {
-            install_signal.connect(installFinished)
-        }
         containerConfigList.configChanged.connect(reloadStatus)
         var command = "apt-cache policy " + currentPackage
         var comp = Qt.createComponent("ContainerManager.qml")
@@ -94,13 +76,6 @@
     Component.onDestruction: {
         containerConfigList.configChanged.disconnect(reloadStatus)
         worker.finishedCommand.disconnect(getPackageVersion)
-        if (install_signal) {
-            install_signal.disconnect(installFinished)
-        }
-    }
-
-    function updateFailureReasonHeight() {
-      failureReason.height = Math.max(failureReason.control.height + 10, 48)
     }
 
     function reloadStatus() {
@@ -114,13 +89,4 @@
     function getPackageVersion(command_output) {
         packageVersionText = containerConfigList.getAppVersion(command_output)
     }
-
-   function installFinished(success, error_msg) {
-       if (!success) {
-           statusText = i18n.tr("failed")
-           failureReasonText = error_msg
-           failureReason.visible = true
-       }
-       install_signal.disconnect(installFinished)
-   }
 }
 
=== added file 'libertine/qml/PackageOperationFailureDialog.qml'
--- libertine/qml/PackageOperationFailureDialog.qml	1970-01-01 00:00:00 +0000
+++ libertine/qml/PackageOperationFailureDialog.qml	2016-04-25 17:15:41 +0000
@@ -0,0 +1,36 @@
+/**
+ * @file PackageOperationFailureDialog.qml
+ * @brief Libertine package operation failure dialog
+ */
+/*
+ * Copyright 2016 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.2
+
+Dialog {
+    id: packageOperationFailedDialog
+    property var package_name: null
+    property var error_msg: null
+    property var operation: null // Either "installing" or "removing"
+
+    title: i18n.tr("Failure %1 the %2 package.").arg(operation).arg(package_name)
+    text: error_msg
+
+    Button {
+        text: i18n.tr("Dismiss")
+        onClicked: PopupUtils.close(packageOperationFailedDialog)
+    }
+}
 
=== modified file 'libertine/qml/SearchResultsView.qml'
--- libertine/qml/SearchResultsView.qml	2016-03-16 19:56:23 +0000
+++ libertine/qml/SearchResultsView.qml	2016-04-25 17:15:41 +0000
@@ -83,6 +83,8 @@
         anchors {
             top: parent.top
             topMargin: units.gu(2)
+            left: parent.left
+            leftMargin: units.gu(2)
         }
     }
     Label {
 
=== modified file 'libertine/qml/libertine.qml'
--- libertine/qml/libertine.qml	2016-01-20 17:34:19 +0000
+++ libertine/qml/libertine.qml	2016-04-25 17:15:41 +0000
@@ -3,7 +3,7 @@
  * @brief Libertine app main view.
  */
 /*
- * Copyright 2015 Canonical Ltd
+ * Copyright 2015-2016 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -18,6 +18,7 @@
  */
 import QtQuick 2.4
 import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.2
 
 
 MainView {
@@ -29,6 +30,9 @@
     property var currentContainer: undefined
     property var currentPackage: undefined
 
+    signal packageInstallFinished(string package_name, bool result, string message)
+    signal packageRemoveFinished(string package_name, bool result, string message)
+
     PageStack {
         id: pageStack
     }
@@ -47,4 +51,18 @@
             pageStack.push(Qt.resolvedUrl("WelcomeView.qml"))
         }
     }
+
+    onPackageInstallFinished: {
+        if (!result) {
+           PopupUtils.open(Qt.resolvedUrl("PackageOperationFailureDialog.qml"), null,
+                                          {"package_name": package_name, "error_msg": message, "operation": i18n.tr("installing")})
+        }
+    }
+
+    onPackageRemoveFinished: {
+        if (!result) {
+           PopupUtils.open(Qt.resolvedUrl("PackageOperationFailureDialog.qml"), null,
+                           {"package_name": package_name, "error_msg": message, "operation": i18n.tr("removing")})
+        }
+    }
 }
 
=== modified file 'po/en_US.po'
--- po/en_US.po	2016-04-08 20:16:41 +0000
+++ po/en_US.po	2016-04-25 17:15:41 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-08 16:01-0400\n"
+"POT-Creation-Date: 2016-04-22 09:44-0400\n"
 "PO-Revision-Date: 2016-03-21 10:21-0400\n"
 "Last-Translator: Chris Townsend <[e-mail]>\n"
 "Language-Team: English\n"
@@ -25,7 +25,7 @@
 msgid "Add additional PPA"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:133
+#: ../libertine/qml/ExtraArchivesView.qml:148
 msgid "Adding archive failed"
 msgstr ""
 
@@ -33,7 +33,7 @@
 msgid "Additional Archives and PPAs"
 msgstr ""
 
-#: ../libertine/qml/ConfigureContainer.qml:59
+#: ../libertine/qml/ManageContainer.qml:59
 msgid "Additional archives and PPAs"
 msgstr ""
 
@@ -41,14 +41,14 @@
 msgid "Authentication required"
 msgstr ""
 
-#: ../libertine/qml/DebianPackagePicker.qml:7
+#: ../libertine/qml/DebianPackagePicker.qml:26
 msgid "Available Debian Packages to Install"
 msgstr ""
 
+#: ../libertine/qml/ContainerOptionsDialog.qml:75
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
 #: ../libertine/qml/SearchPackagesDialog.qml:57
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
 #: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:62
-#: ../libertine/qml/ContainerOptionsDialog.qml:75
 msgid "Cancel"
 msgstr ""
 
@@ -60,27 +60,24 @@
 msgid "Classic Apps - %1"
 msgstr "Classic Apps - %1"
 
-#: ../libertine/qml/ConfigureContainer.qml:27
-msgid "Configure %1"
-msgstr "Configure %1"
-
-#: ../libertine/qml/HomeView.qml:102
-msgid "Configure Container"
-msgstr "Configure Container"
-
 #: ../libertine/qml/ContainerOptionsDialog.qml:28
 #, fuzzy
 msgid "Configure options for container creation."
 msgstr "Configure Container"
 
-#: ../libertine/qml/ContainersView.qml:96
+#: ../libertine/qml/ContainersView.qml:100
 msgid "Container Apps"
 msgstr "Container Apps"
 
-#: ../libertine/qml/ContainersView.qml:87
+#: ../libertine/qml/ContainersView.qml:91
 msgid "Container Info"
 msgstr "Container Info"
 
+#: ../libertine/qml/HomeView.qml:108
+#, fuzzy
+msgid "Container Information"
+msgstr "Container information for %1"
+
 #: ../libertine/qml/ContainerOptionsDialog.qml:27
 #, fuzzy
 msgid "Container Options"
@@ -90,11 +87,12 @@
 msgid "Container information for %1"
 msgstr "Container information for %1"
 
-#: ../libertine/qml/ContainersView.qml:69
+#: ../libertine/qml/ContainersView.qml:73
 msgid "Delete Container"
 msgstr "Delete Container"
 
-#: ../libertine/qml/ExtraArchivesView.qml:137
+#: ../libertine/qml/PackageOperationFailureDialog.qml:33
+#: ../libertine/qml/ExtraArchivesView.qml:152
 msgid "Dismiss"
 msgstr ""
 
@@ -121,9 +119,11 @@
 msgid "Enter package name or Debian file"
 msgstr "Please enter the exact package name of the app to install:"
 
-#: ../libertine/qml/PackageInfoView.qml:66
-msgid "Failure reason"
-msgstr ""
+#. Either "installing" or "removing"
+#: ../libertine/qml/PackageOperationFailureDialog.qml:29
+#, fuzzy
+msgid "Failure %1 the %2 package."
+msgstr "Information for the %1 package"
 
 #: ../libertine/qml/ContainerInfoView.qml:48
 msgid "ID"
@@ -137,8 +137,8 @@
 msgid "Install"
 msgstr "Install"
 
+#: ../libertine/qml/DebianPackagePicker.qml:53
 #: ../libertine/qml/SearchResults.qml:42
-#: ../libertine/qml/DebianPackagePicker.qml:34
 msgid "Install Package"
 msgstr "Install Package"
 
@@ -147,7 +147,7 @@
 msgid "Install new package"
 msgstr "Install Package"
 
-#: ../libertine/qml/PackageInfoView.qml:58
+#: ../libertine/qml/PackageInfoView.qml:56
 #, fuzzy
 msgid "Install status"
 msgstr "Install status: %1"
@@ -156,6 +156,15 @@
 msgid "Invalid password entered"
 msgstr ""
 
+#: ../libertine/qml/ManageContainer.qml:27
+msgid "Manage %1"
+msgstr ""
+
+#: ../libertine/qml/HomeView.qml:102
+#, fuzzy
+msgid "Manage Container"
+msgstr "My Containers"
+
 #: ../libertine/qml/ContainersView.qml:31
 msgid "My Containers"
 msgstr "My Containers"
@@ -165,7 +174,7 @@
 msgid "Name"
 msgstr "Name: %1"
 
-#: ../libertine/qml/DebianPackagePicker.qml:53
+#: ../libertine/qml/DebianPackagePicker.qml:72
 msgid "No Debian packages available"
 msgstr ""
 
@@ -174,18 +183,27 @@
 msgid "No Search Results Found"
 msgstr "No search results for %1."
 
+#: ../libertine/qml/ExtraArchivesView.qml:119
+msgid "No additional archives and PPA's have been added"
+msgstr ""
+
+#: ../libertine/qml/HomeView.qml:227
+#, fuzzy
+msgid "No packages are installed"
+msgstr "Please enter the exact package name of the app to install:"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:64
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
 #: ../libertine/qml/SearchPackagesDialog.qml:39
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
 #: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54
-#: ../libertine/qml/ContainerOptionsDialog.qml:64
 msgid "OK"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:33
+#: ../libertine/qml/PackageInfoView.qml:32
 msgid "Obtaining package version…"
 msgstr "Obtaining package version…"
 
-#: ../libertine/qml/HomeView.qml:202
+#: ../libertine/qml/HomeView.qml:209
 msgid "Package Info"
 msgstr "Package Info"
 
@@ -197,7 +215,7 @@
 msgid "Package name or Debian package path"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:51
+#: ../libertine/qml/PackageInfoView.qml:49
 #, fuzzy
 msgid "Package version"
 msgstr "Package version: %1"
@@ -206,11 +224,11 @@
 msgid "Password is required to create a Libertine container"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:188
+#: ../libertine/qml/HomeView.qml:196
 msgid "Remove Package"
 msgstr "Remove Package"
 
-#: ../libertine/qml/ExtraArchivesView.qml:97
+#: ../libertine/qml/ExtraArchivesView.qml:102
 msgid "Remove extra archive"
 msgstr ""
 
@@ -247,12 +265,12 @@
 msgid "Search archives for packages"
 msgstr ""
 
+#: ../libertine/qml/SearchResultsView.qml:39
 #: ../libertine/qml/SearchPackagesDialog.qml:26
-#: ../libertine/qml/SearchResultsView.qml:39
 msgid "Search for packages"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:90
+#: ../libertine/qml/SearchResultsView.qml:92
 #, fuzzy
 msgid "Searching for packages…"
 msgstr "Obtaining package version…"
@@ -277,10 +295,15 @@
 "The %1 package is already installed. Please try a different package name."
 msgstr "Package %1 already installed. Please try a different package name."
 
-#: ../libertine/qml/HomeView.qml:108
-msgid "Update Container"
+#: ../libertine/qml/ManageContainer.qml:86
+#, fuzzy
+msgid "Update container"
 msgstr "Update Container"
 
+#: ../libertine/qml/ManageContainer.qml:70
+msgid "Update…"
+msgstr ""
+
 #: ../libertine/qml/WelcomeView.qml:27
 msgid "Welcome"
 msgstr "Welcome"
@@ -308,39 +331,38 @@
 msgid "container name"
 msgstr "Container Info"
 
-#: ../libertine/qml/ContainersView.qml:68 ../libertine/qml/HomeView.qml:187
+#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
 msgid "delete"
 msgstr "delete"
 
-#: ../libertine/qml/ContainersView.qml:95
+#: ../libertine/qml/ContainersView.qml:99
 msgid "edit"
 msgstr "edit"
 
-#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:186
-#: ../libertine/qml/PackageInfoView.qml:120
+#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
 msgid "failed"
 msgstr "failed"
 
-#: ../libertine/qml/ConfigureContainer.qml:55
 #: ../libertine/qml/ContainerOptionsDialog.qml:40
+#: ../libertine/qml/ManageContainer.qml:55
 msgid "i386 multiarch support"
 msgstr "i386 multiarch support"
 
-#: ../libertine/qml/ContainersView.qml:86 ../libertine/qml/HomeView.qml:201
+#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
 msgid "info"
 msgstr "info"
 
-#: ../libertine/ContainerConfig.cpp:185
+#: ../libertine/ContainerConfig.cpp:186
 msgid "installed"
 msgstr "installed"
 
-#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:184
-#: ../libertine/qml/ContainersView.qml:51 ../libertine/qml/HomeView.qml:171
-#: ../libertine/qml/ExtraArchivesView.qml:80
+#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
+#: ../libertine/qml/libertine.qml:58 ../libertine/qml/ContainersView.qml:63
+#: ../libertine/qml/HomeView.qml:187 ../libertine/qml/ExtraArchivesView.qml:93
 msgid "installing"
 msgstr "installing"
 
-#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:183
+#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
 msgid "new"
 msgstr "new"
 
@@ -349,24 +371,26 @@
 msgid "password"
 msgstr "Password"
 
-#: ../libertine/ContainerConfig.cpp:149
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
+#: ../libertine/qml/ManageContainer.qml:71
+#: ../libertine/qml/ManageContainer.qml:111
 msgid "ready"
 msgstr "ready"
 
-#: ../libertine/qml/ExtraArchivesView.qml:96
+#: ../libertine/qml/ExtraArchivesView.qml:101
 #, fuzzy
 msgid "remove"
 msgstr "removed"
 
-#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/PackageInfoView.qml:110
+#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
 #: ../libertine/qml/ContainerInfoView.qml:88
+#: ../libertine/qml/PackageInfoView.qml:85
 msgid "removed"
 msgstr "removed"
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/ContainerConfig.cpp:187
-#: ../libertine/qml/ContainersView.qml:52 ../libertine/qml/HomeView.qml:172
-#: ../libertine/qml/ExtraArchivesView.qml:81
+#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
+#: ../libertine/qml/libertine.qml:65 ../libertine/qml/ContainersView.qml:64
+#: ../libertine/qml/HomeView.qml:188 ../libertine/qml/ExtraArchivesView.qml:94
 msgid "removing"
 msgstr "removing"
 
@@ -374,6 +398,18 @@
 msgid "search"
 msgstr ""
 
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
+#: ../libertine/qml/ManageContainer.qml:83
+#: ../libertine/qml/ManageContainer.qml:107
+msgid "updating"
+msgstr ""
+
+#~ msgid "Configure %1"
+#~ msgstr "Configure %1"
+
+#~ msgid "Configure Container"
+#~ msgstr "Configure Container"
+
 #~ msgid "ID: %1"
 #~ msgstr "ID: %1"
 
 
=== modified file 'po/libertine.pot'
--- po/libertine.pot	2016-04-08 20:16:41 +0000
+++ po/libertine.pot	2016-04-25 17:15:41 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-08 16:01-0400\n"
+"POT-Creation-Date: 2016-04-22 09:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,145 +17,83 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:183
+#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
 msgid "new"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:184
-#: ../libertine/qml/ContainersView.qml:51 ../libertine/qml/HomeView.qml:171
-#: ../libertine/qml/ExtraArchivesView.qml:80
+#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
+#: ../libertine/qml/libertine.qml:58 ../libertine/qml/ContainersView.qml:63
+#: ../libertine/qml/HomeView.qml:187 ../libertine/qml/ExtraArchivesView.qml:93
 msgid "installing"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:149
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
+#: ../libertine/qml/ManageContainer.qml:71
+#: ../libertine/qml/ManageContainer.qml:111
 msgid "ready"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/ContainerConfig.cpp:187
-#: ../libertine/qml/ContainersView.qml:52 ../libertine/qml/HomeView.qml:172
-#: ../libertine/qml/ExtraArchivesView.qml:81
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
+#: ../libertine/qml/ManageContainer.qml:83
+#: ../libertine/qml/ManageContainer.qml:107
+msgid "updating"
+msgstr ""
+
+#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
+#: ../libertine/qml/libertine.qml:65 ../libertine/qml/ContainersView.qml:64
+#: ../libertine/qml/HomeView.qml:188 ../libertine/qml/ExtraArchivesView.qml:94
 msgid "removing"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/PackageInfoView.qml:110
+#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
 #: ../libertine/qml/ContainerInfoView.qml:88
+#: ../libertine/qml/PackageInfoView.qml:85
 msgid "removed"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:186
-#: ../libertine/qml/PackageInfoView.qml:120
+#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
 msgid "failed"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:185
+#: ../libertine/ContainerConfig.cpp:186
 msgid "installed"
 msgstr ""
 
-#: ../libertine/qml/PackageExistsDialog.qml:28
-msgid "The %1 package is already installed."
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:29
-msgid "Search again or return to search results."
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:33
-msgid "Search again"
-msgstr ""
-
-#: ../libertine/qml/PackageExistsDialog.qml:43
-msgid "Return to search results"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:31
-msgid "My Containers"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:68 ../libertine/qml/HomeView.qml:187
-msgid "delete"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:69
-msgid "Delete Container"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:86 ../libertine/qml/HomeView.qml:201
-msgid "info"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:87
-msgid "Container Info"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:95
-msgid "edit"
-msgstr ""
-
-#: ../libertine/qml/ContainersView.qml:96
-msgid "Container Apps"
-msgstr ""
-
-#: ../libertine/qml/ConfigureContainer.qml:27
-msgid "Configure %1"
-msgstr ""
-
-#: ../libertine/qml/ConfigureContainer.qml:55
+#: ../libertine/qml/ContainerOptionsDialog.qml:27
+msgid "Container Options"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:28
+msgid "Configure options for container creation."
+msgstr ""
+
 #: ../libertine/qml/ContainerOptionsDialog.qml:40
+#: ../libertine/qml/ManageContainer.qml:55
 msgid "i386 multiarch support"
 msgstr ""
 
-#: ../libertine/qml/ConfigureContainer.qml:59
-msgid "Additional archives and PPAs"
-msgstr ""
-
-#: ../libertine/qml/SearchPackagesDialog.qml:26
-#: ../libertine/qml/SearchResultsView.qml:39
-msgid "Search for packages"
-msgstr ""
-
-#: ../libertine/qml/SearchPackagesDialog.qml:27
-msgid "Search archives for packages"
-msgstr ""
-
-#: ../libertine/qml/SearchPackagesDialog.qml:31
-msgid "search"
-msgstr ""
-
+#: ../libertine/qml/ContainerOptionsDialog.qml:50
+msgid "Enter or name for the container or leave blank for default name"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:56
+msgid "container name"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:64
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
 #: ../libertine/qml/SearchPackagesDialog.qml:39
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
 #: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54
-#: ../libertine/qml/ContainerOptionsDialog.qml:64
 msgid "OK"
 msgstr ""
 
+#: ../libertine/qml/ContainerOptionsDialog.qml:75
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
 #: ../libertine/qml/SearchPackagesDialog.qml:57
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
 #: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:62
-#: ../libertine/qml/ContainerOptionsDialog.qml:75
 msgid "Cancel"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:28
-msgid "Information for the %1 package"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:33
-msgid "Obtaining package version…"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:51
-msgid "Package version"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:58
-msgid "Install status"
-msgstr ""
-
-#: ../libertine/qml/PackageInfoView.qml:66
-msgid "Failure reason"
-msgstr ""
-
 #: ../libertine/qml/SearchResultsView.qml:28
 msgid "Package Search Results"
 msgstr ""
@@ -164,6 +102,11 @@
 msgid "Search"
 msgstr ""
 
+#: ../libertine/qml/SearchResultsView.qml:39
+#: ../libertine/qml/SearchPackagesDialog.qml:26
+msgid "Search for packages"
+msgstr ""
+
 #: ../libertine/qml/SearchResultsView.qml:49
 msgid "No Search Results Found"
 msgstr ""
@@ -176,20 +119,20 @@
 msgid "Return to Apps Page"
 msgstr ""
 
-#: ../libertine/qml/SearchResultsView.qml:90
+#: ../libertine/qml/SearchResultsView.qml:92
 msgid "Searching for packages…"
 msgstr ""
 
+#: ../libertine/qml/DebianPackagePicker.qml:26
+msgid "Available Debian Packages to Install"
+msgstr ""
+
+#: ../libertine/qml/DebianPackagePicker.qml:53
 #: ../libertine/qml/SearchResults.qml:42
-#: ../libertine/qml/DebianPackagePicker.qml:34
 msgid "Install Package"
 msgstr ""
 
-#: ../libertine/qml/DebianPackagePicker.qml:7
-msgid "Available Debian Packages to Install"
-msgstr ""
-
-#: ../libertine/qml/DebianPackagePicker.qml:53
+#: ../libertine/qml/DebianPackagePicker.qml:72
 msgid "No Debian packages available"
 msgstr ""
 
@@ -209,6 +152,88 @@
 msgid "password"
 msgstr ""
 
+#: ../libertine/qml/ContainerInfoView.qml:28
+msgid "Container information for %1"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:48
+msgid "ID"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:55
+msgid "Name"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:62
+msgid "Distribution"
+msgstr ""
+
+#: ../libertine/qml/ContainerInfoView.qml:69
+msgid "Status"
+msgstr ""
+
+#. Either "installing" or "removing"
+#: ../libertine/qml/PackageOperationFailureDialog.qml:29
+msgid "Failure %1 the %2 package."
+msgstr ""
+
+#: ../libertine/qml/PackageOperationFailureDialog.qml:33
+#: ../libertine/qml/ExtraArchivesView.qml:152
+msgid "Dismiss"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:31
+msgid "My Containers"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
+msgid "delete"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:73
+msgid "Delete Container"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
+msgid "info"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:91
+msgid "Container Info"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:99
+msgid "edit"
+msgstr ""
+
+#: ../libertine/qml/ContainersView.qml:100
+msgid "Container Apps"
+msgstr ""
+
+#: ../libertine/qml/SearchPackagesDialog.qml:27
+msgid "Search archives for packages"
+msgstr ""
+
+#: ../libertine/qml/SearchPackagesDialog.qml:31
+msgid "search"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:27
+msgid "Manage %1"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:59
+msgid "Additional archives and PPAs"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:70
+msgid "Update…"
+msgstr ""
+
+#: ../libertine/qml/ManageContainer.qml:86
+msgid "Update container"
+msgstr ""
+
 #: ../libertine/qml/HomeView.qml:27
 msgid "Classic Apps - %1"
 msgstr ""
@@ -231,11 +256,11 @@
 msgstr ""
 
 #: ../libertine/qml/HomeView.qml:102
-msgid "Configure Container"
+msgid "Manage Container"
 msgstr ""
 
 #: ../libertine/qml/HomeView.qml:108
-msgid "Update Container"
+msgid "Container Information"
 msgstr ""
 
 #: ../libertine/qml/HomeView.qml:114
@@ -254,14 +279,53 @@
 msgid "Search archives for a package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:188
+#: ../libertine/qml/HomeView.qml:196
 msgid "Remove Package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:202
+#: ../libertine/qml/HomeView.qml:209
 msgid "Package Info"
 msgstr ""
 
+#: ../libertine/qml/HomeView.qml:227
+msgid "No packages are installed"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:28
+msgid "Information for the %1 package"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:32
+msgid "Obtaining package version…"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:49
+msgid "Package version"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:56
+msgid "Install status"
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:27
+msgid "Welcome"
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:42
+msgid "Welcome to the Ubuntu Legacy Application Support Manager."
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:50
+msgid ""
+"You do not have Legacy Application Support configured at this time.  "
+"Downloading and setting up the required environment takes some time and "
+"network bandwidth."
+msgstr ""
+
+#: ../libertine/qml/WelcomeView.qml:58
+msgid "Install"
+msgstr ""
+
 #: ../libertine/qml/ExtraArchivesView.qml:26
 msgid "Additional Archives and PPAs"
 msgstr ""
@@ -282,73 +346,34 @@
 msgid "Enter name of PPA in the form ppa:user/ppa-name:"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:96
+#: ../libertine/qml/ExtraArchivesView.qml:101
 msgid "remove"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:97
+#: ../libertine/qml/ExtraArchivesView.qml:102
 msgid "Remove extra archive"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:133
+#: ../libertine/qml/ExtraArchivesView.qml:119
+msgid "No additional archives and PPA's have been added"
+msgstr ""
+
+#: ../libertine/qml/ExtraArchivesView.qml:148
 msgid "Adding archive failed"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:137
-msgid "Dismiss"
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:27
-msgid "Welcome"
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:42
-msgid "Welcome to the Ubuntu Legacy Application Support Manager."
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:50
-msgid ""
-"You do not have Legacy Application Support configured at this time.  "
-"Downloading and setting up the required environment takes some time and "
-"network bandwidth."
-msgstr ""
-
-#: ../libertine/qml/WelcomeView.qml:58
-msgid "Install"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:28
-msgid "Container information for %1"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:48
-msgid "ID"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:55
-msgid "Name"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:62
-msgid "Distribution"
-msgstr ""
-
-#: ../libertine/qml/ContainerInfoView.qml:69
-msgid "Status"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:27
-msgid "Container Options"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:28
-msgid "Configure options for container creation."
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:50
-msgid "Enter or name for the container or leave blank for default name"
-msgstr ""
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:56
-msgid "container name"
+#: ../libertine/qml/PackageExistsDialog.qml:28
+msgid "The %1 package is already installed."
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:29
+msgid "Search again or return to search results."
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:33
+msgid "Search again"
+msgstr ""
+
+#: ../libertine/qml/PackageExistsDialog.qml:43
+msgid "Return to search results"
 msgstr ""
 
=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-04-07 18:03:04 +0000
+++ python/libertine/ChrootContainer.py	2016-04-25 17:15:41 +0000
@@ -199,8 +199,8 @@
         return returncode
 
     def _build_proot_command(self):
-        proot_cmd = '/usr/bin/proot'
-        if not os.path.isfile(proot_cmd) or not os.access(proot_cmd, os.X_OK):
+        proot_cmd = shutil.which('proot')
+        if not proot_cmd:
             raise RuntimeError('executable proot not found')
 
         proot_cmd += " -R " + self.root_path
@@ -234,8 +234,8 @@
         return proot_cmd
 
     def _build_privileged_proot_cmd(self):
-        proot_cmd = '/usr/bin/proot'
-        if not os.path.isfile(proot_cmd) or not os.access(proot_cmd, os.X_OK):
+        proot_cmd = shutil.which('proot')
+        if not proot_cmd:
             raise RuntimeError('executable proot not found')
 
         proot_cmd += " -b /usr/lib/locale -S " + self.root_path
 
=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-04-07 20:39:10 +0000
+++ python/libertine/Libertine.py	2016-04-25 17:15:41 +0000
@@ -56,7 +56,14 @@
 
 
 def apt_command_prefix(verbosity):
-    return '/usr/bin/apt ' + apt_args_for_verbosity_level(verbosity) + ' '
+    return '/usr/bin/apt-get ' + apt_args_for_verbosity_level(verbosity) + \
+           ' --option Apt::Cmd::Disable-Script-Warning=true --option Dpkg::Progress-Fancy=1' + \
+           ' --option Apt::Color=1 '
+
+
+def handle_runtime_error(error):
+    print("%s" % error)
+    return False
 
 
 class BaseContainer(metaclass=abc.ABCMeta):
@@ -311,15 +318,21 @@
         """
         Updates the contents of the container.
         """
-        with ContainerRunning(self.container):
-            self.container.update_packages(verbosity)
+        try:
+            with ContainerRunning(self.container):
+                self.container.update_packages(verbosity)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
 
     def install_package(self, package_name, verbosity=1):
         """
         Installs a package in the container.
         """
-        with ContainerRunning(self.container):
-            return self.container.install_package(package_name, verbosity)
+        try:
+            with ContainerRunning(self.container):
+                return self.container.install_package(package_name, verbosity)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
 
     def remove_package(self, package_name, verbosity=1):
         """
@@ -328,9 +341,13 @@
         :param package_name: The name of the package to be removed.
         :param verbosity: The verbosity level of the progress reporting.
         """
-        with ContainerRunning(self.container):
-            self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") == 0
-            self.container.run_in_container(apt_command_prefix(verbosity) + "autoremove --purge") == 0
+        try:
+            with ContainerRunning(self.container):
+                if self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") != 0:
+                    return False
+                return self.container.run_in_container(apt_command_prefix(verbosity) + "autoremove --purge") == 0
+        except RuntimeError as e:
+            return handle_runtime_error(e)
 
     def search_package_cache(self, search_string):
         """
@@ -339,8 +356,11 @@
         :param search_string: the (regex) to use to search the package cache.
             The regex is quoted to sanitize it.
         """
-        with ContainerRunning(self.container):
-            self.container.run_in_container("/usr/bin/apt-cache search '" + search_string + "'")
+        try:
+            with ContainerRunning(self.container):
+                self.container.run_in_container("/usr/bin/apt-cache search '" + search_string + "'")
+        except RuntimeError as e:
+            return handle_runtime_error(e)
 
     def launch_application(self, app_exec_line):
         """
@@ -350,7 +370,7 @@
             ubuntu-app-launch
         """
         if libertine.utils.container_exists(self.container.container_id):
-            self.container.launch_application(app_exec_line) 
+            self.container.launch_application(app_exec_line)
         else:
             raise RuntimeError("Container with id %s does not exist." % self.container.container_id)
 
@@ -380,9 +400,15 @@
             example, 'apt-cache policy package-foo'
         :rtype: The output of the given command.
         """
-        with ContainerRunning(self.container):
-            return self.container.run_in_container(exec_line)
+        try:
+            with ContainerRunning(self.container):
+                return self.container.run_in_container(exec_line)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
 
     def configure_command(self, command, *args):
-        with ContainerRunning(self.container):
-            return self.container.configure_command(command, *args)
+        try:
+            with ContainerRunning(self.container):
+                return self.container.configure_command(command, *args)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
 
=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-04-11 13:42:37 +0000
+++ tools/libertine-container-manager	2016-04-25 17:15:41 +0000
@@ -31,6 +31,40 @@
 from libertine import LibertineContainer
 
 
+def find_duplicate_container_entry(container_list, container_id):
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            return container
+
+    return None
+ 
+
+def merge_container_config_files(filepath):
+    merged_json = []
+    main_config = read_container_config_file()
+
+    with open(filepath, 'r') as fd:
+        merge_source = json.load(fd)
+
+    if "containerList" in main_config:
+        # Finds any duplicate entries and assumes we want to update the main config
+        # with entries from the merge source.
+        for i, container in enumerate(main_config['containerList']):
+            merge_container = find_duplicate_container_entry(merge_source, container['id'])
+            if merge_container:
+                 main_config['containerList'][i] = merge_container
+                 merge_source['containerList'].remove(merge_container)
+ 
+        # Merges in any remaining non-duplicate entries.
+        for container in merge_source['containerList']:
+            main_config['containerList'].append(container)
+
+    else:
+        main_config = merge_source
+
+    write_container_config_file(main_config)
+
+
 def read_container_config_file():
     container_list = {}
     container_config_file = libertine.utils.get_libertine_database_file_path()
@@ -83,7 +117,10 @@
 
 def is_distro_valid(distro, force):
     if force:
-       return UbuntuDistroInfo().valid(distro)
+        return UbuntuDistroInfo().valid(distro)
+
+    if distro == get_host_distro_release():
+        return True
 
     supported_distros = UbuntuDistroInfo().supported()
 
@@ -418,7 +455,10 @@
     container = LibertineContainer(args.id)
     update_package_install_status(args.id, args.package, "removing")
 
-    container.remove_package(args.package, args.verbosity)
+    if not container.remove_package(args.package, args.verbosity):
+        update_package_install_status(args.id, args.package, "installed")
+        sys.exit(1)
+
     update_package_install_status(args.id, args.package, "removed")
 
     delete_package(args.id, args.package)
@@ -432,7 +472,8 @@
         args.id = get_default_container_id()
 
     container = LibertineContainer(args.id)
-    container.search_package_cache(args.search_string)
+    if not container.search_package_cache(args.search_string):
+        sys.exit(1)
 
 
 def update(args):
@@ -443,7 +484,13 @@
         args.id = get_default_container_id()
 
     container = LibertineContainer(args.id)
-    container.update_libertine_container(args.verbosity)
+
+    update_container_install_status(args.id, "updating")
+    if not container.update_libertine_container(args.verbosity):
+        update_container_install_status(args.id, "ready")
+        sys.exit(1)
+
+    update_container_install_status(args.id, "ready")
 
 
 def list(args):
@@ -494,7 +541,9 @@
             print("i386 multiarch support is already %s" % multiarch)
             sys.exit(1)
 
-        container.configure_command('multiarch', args.multiarch)
+        if not container.configure_command('multiarch', args.multiarch):
+            sys.exit(1)
+
         update_container_multiarch_support(args.id, multiarch)
 
     elif args.add_archive:
@@ -523,15 +572,26 @@
         delete_container_archive(args.id, args.delete_archive)
 
 
+def merge(args):
+    merge_container_config_files(args.file)
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Legacy X application support for Unity 8")
+
+    if not os.geteuid():
+        print("Please do not run %s using sudo" % parser.prog)
+        sys.exit(1)
+
     parser.add_argument('-q', '--quiet',
                         action='store_const', dest='verbosity', const=0,
                         help=('do not print status updates on stdout'))
     parser.add_argument('-v', '--verbose',
                         action='store_const', dest='verbosity', const=2,
                         help=('extra verbose output'))
-    subparsers = parser.add_subparsers(dest="subparser_name")
+    subparsers = parser.add_subparsers(dest="subparser_name", 
+                                       title="subcommands",
+                                       metavar='create, destroy, install-package, remove-package, search-cache, update, list, list-apps, configure')
 
     # Handle the create command and its options
     parser_create = subparsers.add_parser(
@@ -587,17 +647,17 @@
     parser_install.set_defaults(func=install_package)
 
     # Handle the remove-package command and its options
-    parser_install = subparsers.add_parser(
+    parser_remove = subparsers.add_parser(
         'remove-package',
         help=("Remove a package in the specified Libertine container."))
-    parser_install.add_argument(
+    parser_remove.add_argument(
         '-p', '--package',
         required=True,
         help=("Name of package to remove. Required."))
-    parser_install.add_argument(
+    parser_remove.add_argument(
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
-    parser_install.set_defaults(func=remove_package)
+    parser_remove.set_defaults(func=remove_package)
 
     # Handle the search-cache command and its options
     parser_search = subparsers.add_parser(
@@ -643,7 +703,8 @@
     # Handle the execute command and it's options
     parser_exec = subparsers.add_parser(
         'exec',
-        help=("Run an arbitrary command in the specified Libertine container."))
+        add_help=False)
+        #help=("Run an arbitrary command in the specified Libertine container."))
     parser_exec.add_argument(
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
@@ -677,9 +738,21 @@
               "Needs to be in the form of \"ppa:user/ppa-name\"."))
     parser_configure.set_defaults(func=configure)
 
+    # Handle merging another ContainersConfig.json file into the main ContainersConfig.json file
+    parser_merge = subparsers.add_parser(
+        'merge-configs',
+        add_help=False)
+    parser_merge.add_argument(
+        '-f', '--file',
+        required=True)
+    parser_merge.set_defaults(func=merge)
+
     # Actually parse the args
     args = parser.parse_args()
     if args.verbosity is None:
         args.verbosity = 1
 
-    args.func(args)
+    if args.subparser_name == None:
+        parser.print_help()
+    else:
+        args.func(args)