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

[Christopher Townsend]

* Enable feature to add and remove extra archives in the container. This is for PPA's only right now.
* add multiarch support to chroot containers too.
* When killing processes in the container, need to wait() after terminating
processes and to actually terminate and wait() on the main process. Caused
app launching issues in LXC based containers.

[Stephen M. Webb (bregma)]

review: Approve

[lp:~townsend/libertine/0.99.12]

121. By Christopher Townsend on 2016-03-21

When killing processes in the container, need to wait() after terminating
processes and to actually terminate and wait() on the main process. Caused
app launching issues in LXC based containers. (LP: #1558588)

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-02 22:06:45 +0000
+++ debian/changelog	2016-03-21 12:56:41 +0000
@@ -1,3 +1,17 @@
+libertine (0.99.12-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Enable feature to add and remove extra archives in the container. This is
+    for PPA's only right now. (LP: #1541901)
+  * When killing processes in the container, need to wait() after terminating
+    processes and to actually terminate and wait() on the main process.  Caused
+    app launching issues in LXC based containers. (LP: #1558588)
+
+  [ Stephen M. Webb ]
+  * add multiarch support to chroot containers too. (LP: #1556303)
+
+ -- Chris Townsend <[e-mail]>  Wed, 16 Mar 2016 15:38:04 -0400
+
 libertine (0.99.11+16.04.20160302-0ubuntu1) xenial; urgency=medium
 
   [ Chris Townsend ]

=== added file 'libertine/ContainerArchivesList.cpp'
--- libertine/ContainerArchivesList.cpp	1970-01-01 00:00:00 +0000
+++ libertine/ContainerArchivesList.cpp	2016-03-21 12:56:41 +0000
@@ -0,0 +1,94 @@
+/**
+ * @file ContainerArchivesList.cpp
+ * @brief Libertine Manager list of extra container archives, ie, PPAs
+ */
+/*
+ * 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/>.
+ */
+#include "libertine/ContainerArchivesList.h"
+#include "libertine/ContainerConfigList.h"
+
+ContainerArchivesList::
+ContainerArchivesList(ContainerConfigList* container_config_list,
+                      QObject* parent)
+: QAbstractListModel(parent)
+, container_config_list_(container_config_list)
+{ }
+
+
+ContainerArchivesList::
+~ContainerArchivesList()
+{ }
+
+
+void ContainerArchivesList::
+setContainerArchives(QString const& container_id)
+{
+  archives_ = container_config_list_->getArchivesForContainer(container_id);
+
+  beginResetModel();
+  endResetModel();
+}
+
+
+bool ContainerArchivesList::
+empty() const noexcept
+{ return archives_->empty(); }
+
+
+ContainerArchivesList::size_type ContainerArchivesList::
+size() const noexcept
+{ return archives_->count(); }
+
+
+int ContainerArchivesList::
+rowCount(QModelIndex const&) const
+{
+  return this->size();
+}
+
+
+QHash<int, QByteArray> ContainerArchivesList::
+roleNames() const
+{
+  QHash<int, QByteArray> roles;
+  roles[static_cast<int>(DataRole::ArchiveName)] = "archiveName";
+  roles[static_cast<int>(DataRole::ArchiveStatus)] = "archiveStatus";
+
+  return roles;
+}
+
+
+QVariant ContainerArchivesList::
+data(QModelIndex const& index, int role) const
+{
+  QVariant result;
+
+  if (index.isValid() && index.row() <= archives_->count())
+  {
+    switch (static_cast<DataRole>(role))
+    {
+      case DataRole::ArchiveName:
+        result = (*archives_)[index.row()]->archive_name();
+        break;
+      case DataRole::ArchiveStatus:
+        result = (*archives_)[index.row()]->archive_status();
+        break;
+      case DataRole::Error:
+        break;
+    }
+  }
+
+  return result;
+}

=== added file 'libertine/ContainerArchivesList.h'
--- libertine/ContainerArchivesList.h	1970-01-01 00:00:00 +0000
+++ libertine/ContainerArchivesList.h	2016-03-21 12:56:41 +0000
@@ -0,0 +1,81 @@
+/**
+ * @file ContainerArchivesList.h
+ * @brief Libertine Manager list of extra container archives (PPAs)
+ */
+/*
+ * 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/>.
+ */
+#ifndef _CONTAINER_ARCHIVES_LIST_H_
+#define _CONTAINER_ARCHIVES_LIST_H_
+
+#include "libertine/ContainerConfig.h"
+
+#include <QtCore/QAbstractListModel>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+
+class ContainerArchives;
+class ContainerConfigList;
+
+class ContainerArchivesList
+: public QAbstractListModel
+{
+  Q_OBJECT
+
+public:
+  using ArchivesList = QList<ContainerArchives*>;
+  using iterator = ArchivesList::iterator;
+  using size_type = ArchivesList::size_type;
+
+  enum class DataRole
+  : int
+  {
+    ArchiveName = Qt::UserRole + 1,
+    ArchiveStatus,
+    Error
+  };
+
+public:
+  explicit
+  ContainerArchivesList(ContainerConfigList* container_config_list,
+                        QObject* parent = nullptr);
+
+  ~ContainerArchivesList();
+
+  Q_INVOKABLE void
+  setContainerArchives(QString const& container_id);
+
+  Q_INVOKABLE bool
+  empty() const noexcept;
+
+  size_type
+  size() const noexcept;
+
+  int
+  rowCount(QModelIndex const& parent = QModelIndex()) const;
+
+  QHash<int, QByteArray>
+  roleNames() const;
+
+  QVariant
+  data(QModelIndex const& index, int role = Qt::DisplayRole) const;
+
+private:
+  ContainerConfigList* container_config_list_;
+  ArchivesList*        archives_;
+};
+
+#endif /* _CONTAINER_ARCHIVES_LIST_H_ */

=== modified file 'libertine/ContainerConfig.cpp'
--- libertine/ContainerConfig.cpp	2016-02-10 19:31:10 +0000
+++ libertine/ContainerConfig.cpp	2016-03-21 12:56:41 +0000
@@ -178,15 +178,15 @@
     return ContainerConfig::InstallStatus::New;
   }
 
-  const static struct { QString string; ContainerApps::AppStatus enumeration; } app_status_names[] =
+  const static struct { QString string; CurrentStatus enumeration; } status_names[] =
   {
-    { QObject::tr("new"),        ContainerApps::AppStatus::New        },
-    { QObject::tr("installing"), ContainerApps::AppStatus::Installing },
-    { QObject::tr("installed"),  ContainerApps::AppStatus::Installed  },
-    { QObject::tr("failed"),     ContainerApps::AppStatus::Failed     },
-    { QObject::tr("removing"),   ContainerApps::AppStatus::Removing   },
-    { QObject::tr("removed"),    ContainerApps::AppStatus::Removed    },
-    { QString(),                 ContainerApps::AppStatus::New        }
+    { QObject::tr("new"),        CurrentStatus::New        },
+    { QObject::tr("installing"), CurrentStatus::Installing },
+    { QObject::tr("installed"),  CurrentStatus::Installed  },
+    { QObject::tr("failed"),     CurrentStatus::Failed     },
+    { QObject::tr("removing"),   CurrentStatus::Removing   },
+    { QObject::tr("removed"),    CurrentStatus::Removed    },
+    { QString(),                 CurrentStatus::New        }
   };
 
   QString
@@ -207,10 +207,10 @@
     return package_name;
   }
 
-  ContainerApps::AppStatus
+  CurrentStatus
   extract_app_status_from_json(QJsonObject const& json_object)
   {
-    ContainerApps::AppStatus app_status = ContainerApps::AppStatus::New;
+    CurrentStatus app_status = CurrentStatus::New;
 
     QJsonValue value = json_object["appStatus"];
     if (value != QJsonValue::Undefined)
@@ -221,7 +221,7 @@
         QString s = value.toString();
         if (s.length() > 0)
         {
-          for (auto const& name: app_status_names)
+          for (auto const& name: status_names)
           {
             if (0 == s.compare(name.string, Qt::CaseInsensitive))
             {
@@ -241,7 +241,7 @@
   {
     QList<ContainerApps*> container_apps;
     QString package_name;
-    ContainerApps::AppStatus app_status;
+    CurrentStatus app_status;
 
     QJsonArray installed_apps = json_object["installedApps"].toArray();
 
@@ -255,12 +255,78 @@
     }
     return container_apps;
   }
+
+  QString
+  extract_archive_name_from_json(QJsonObject const& json_object)
+  {
+    QString archive_name;
+
+    QJsonValue value = json_object["archiveName"];
+    if (value != QJsonValue::Undefined)
+    {
+      QJsonValue::Type value_type = value.type();
+      if (value_type == QJsonValue::String)
+      {
+        archive_name = value.toString();
+      }
+    }
+
+    return archive_name;
+  }
+
+  CurrentStatus
+  extract_archive_status_from_json(QJsonObject const& json_object)
+  {
+    CurrentStatus archive_status = CurrentStatus::New;
+
+    QJsonValue value = json_object["archiveStatus"];
+    if (value != QJsonValue::Undefined)
+    {
+      QJsonValue::Type value_type = value.type();
+      if (value_type == QJsonValue::String)
+      {
+        QString s = value.toString();
+        if (s.length() > 0)
+        {
+          for (auto const& name: status_names)
+          {
+            if (0 == s.compare(name.string, Qt::CaseInsensitive))
+            {
+              archive_status = name.enumeration;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    return archive_status;
+  }
+
+  QList<ContainerArchives*>
+  extract_container_archives_from_json(QJsonObject const& json_object)
+  {
+    QList<ContainerArchives*> container_archives;
+    QString archive_name;
+    CurrentStatus archive_status;
+
+    QJsonArray extra_archives = json_object["extraArchives"].toArray();
+
+    for (auto const& archive: extra_archives)
+    {
+      archive_name = extract_archive_name_from_json(archive.toObject());
+      archive_status = extract_archive_status_from_json(archive.toObject());
+
+      container_archives.append(new ContainerArchives(archive_name, archive_status));
+    }
+    return container_archives;
+  }
 } // anonymous namespace
 
 
 ContainerApps::
 ContainerApps(QString const& package_name,
-              ContainerApps::AppStatus app_status,
+              CurrentStatus app_status,
               QObject* parent)
 : QObject(parent)
 , package_name_(package_name)
@@ -280,7 +346,32 @@
 
 QString const& ContainerApps::
 app_status() const
-{ return app_status_names[(int)app_status_].string; }
+{ return status_names[(int)app_status_].string; }
+
+
+ContainerArchives::
+ContainerArchives(QString const& archive_name,
+                  CurrentStatus archive_status,
+                  QObject* parent)
+: QObject(parent)
+, archive_name_(archive_name)
+, archive_status_(archive_status)
+{ }
+
+
+ContainerArchives::
+~ContainerArchives()
+{ }
+
+
+QString const& ContainerArchives::
+archive_name() const
+{ return archive_name_; }
+
+
+QString const& ContainerArchives::
+archive_status() const
+{ return status_names[(int)archive_status_].string; }
 
 
 ContainerConfig::
@@ -316,6 +407,7 @@
 , multiarch_support_(extract_multiarch_support_from_json(json_object))
 , install_status_(extract_install_status_from_json(json_object))
 , container_apps_(extract_container_apps_from_json(json_object))
+, container_archives_(extract_container_archives_from_json(json_object))
 { }
 
 
@@ -375,12 +467,19 @@
 { return container_apps_; }
 
 
+QList<ContainerArchives*> & ContainerConfig::
+container_archives()
+{ return container_archives_; }
+
+
 QJsonObject ContainerConfig::
 toJson() const
 {
   QJsonObject json_object,
-              app_object;
-  QJsonArray apps;
+              app_object,
+              archive_object;
+  QJsonArray apps,
+             archives;
 
   json_object["id"] = container_id_;
   json_object["name"] = container_name_;
@@ -397,10 +496,17 @@
   for (auto const& container_app: container_apps_)
   {
     app_object["packageName"] = container_app->package_name();
-    app_object["appStatus"] = app_status_names[0].string;
+    app_object["appStatus"] = status_names[0].string;
     apps.append(app_object);
   }
   json_object["installedApps"] = apps;
 
+  for (auto const& container_archive: container_archives_)
+  {
+    archive_object["archiveName"] = container_archive->archive_name();
+    archives.append(archive_object);
+  }
+  json_object["extraArchives"] = archives;
+
   return json_object;
 }

=== modified file 'libertine/ContainerConfig.h'
--- libertine/ContainerConfig.h	2016-02-10 19:31:10 +0000
+++ libertine/ContainerConfig.h	2016-03-21 12:56:41 +0000
@@ -24,18 +24,17 @@
 #include <QtCore/QString>
 
 
+enum class CurrentStatus { New, Installing, Installed, Failed, Removing, Removed };
+
+
 class ContainerApps
 : public QObject
 {
   Q_OBJECT
 
 public:
-  enum class AppStatus
-  { New, Installing, Installed, Failed, Removing, Removed };
-
-public:
   ContainerApps(QString const& package_name,
-                AppStatus app_status,
+                CurrentStatus app_status,
                 QObject* parent = nullptr);
   ~ContainerApps();
 
@@ -46,8 +45,31 @@
   app_status() const;
 
 private:
-  QString   package_name_;
-  AppStatus app_status_;
+  QString       package_name_;
+  CurrentStatus app_status_;
+};
+
+
+class ContainerArchives
+: public QObject
+{
+  Q_OBJECT
+
+public:
+  ContainerArchives(QString const& archive_name,
+                    CurrentStatus archive_status,
+                    QObject* parent = nullptr);
+  ~ContainerArchives();
+
+  QString const&
+  archive_name() const;
+
+  QString const&
+  archive_status() const;
+
+private:
+  QString archive_name_;
+  CurrentStatus archive_status_;
 };
 
 
@@ -107,6 +129,9 @@
   QList<ContainerApps*> &
   container_apps();
 
+  QList<ContainerArchives*> &
+  container_archives();
+
   QJsonObject
   toJson() const;
 
@@ -115,13 +140,14 @@
   void installStatusChanged();
 
 private:
-  QString               container_id_;
-  QString               container_name_;
-  QString               container_type_;
-  QString               distro_series_;
-  QString               multiarch_support_;
-  InstallStatus         install_status_;
-  QList<ContainerApps*> container_apps_;
+  QString                   container_id_;
+  QString                   container_name_;
+  QString                   container_type_;
+  QString                   distro_series_;
+  QString                   multiarch_support_;
+  InstallStatus             install_status_;
+  QList<ContainerApps*>     container_apps_;
+  QList<ContainerArchives*> container_archives_;
 };
 
 #endif /* CONTAINER_CONTAINERCONFIG_H */

=== modified file 'libertine/ContainerConfigList.cpp'
--- libertine/ContainerConfigList.cpp	2016-02-11 15:25:09 +0000
+++ libertine/ContainerConfigList.cpp	2016-03-21 12:56:41 +0000
@@ -121,7 +121,7 @@
   {
     if (config->container_id() == container_id)
     {
-      config->container_apps().append(new ContainerApps(package_name, ContainerApps::AppStatus::New, this));
+      config->container_apps().append(new ContainerApps(package_name, CurrentStatus::New, this));
       break;
     }
   }
@@ -193,6 +193,20 @@
 } 
 
 
+QList<ContainerArchives*> * ContainerConfigList::
+getArchivesForContainer(QString const& container_id)
+{
+  for (auto const& config: configs_)
+  {
+    if (config->container_id() == container_id)
+    {
+      return &(config->container_archives());
+    }
+  }
+  return nullptr;
+}
+
+
 QString ContainerConfigList::
 getContainerType(QString const& container_id)
 {

=== modified file 'libertine/ContainerConfigList.h'
--- libertine/ContainerConfigList.h	2016-02-11 15:25:09 +0000
+++ libertine/ContainerConfigList.h	2016-03-21 12:56:41 +0000
@@ -25,6 +25,7 @@
 
 
 class ContainerApps;
+class ContainerArchives;
 class ContainerConfig;
 class LibertineConfig;
 
@@ -112,6 +113,9 @@
   Q_INVOKABLE QString
   getAppVersion(QString const& app_info);
 
+  QList<ContainerArchives*> *
+  getArchivesForContainer(QString const& container_id);
+
   Q_INVOKABLE QString
   getContainerType(QString const& container_id);
 

=== modified file 'libertine/ContainerManager.cpp'
--- libertine/ContainerManager.cpp	2016-02-11 15:59:00 +0000
+++ libertine/ContainerManager.cpp	2016-03-21 12:56:41 +0000
@@ -395,6 +395,9 @@
 void ContainerManagerWorker::
 configureContainer(QStringList configure_command)
 {
+  QByteArray error_msg;
+  bool result = true;
+
   QProcess libertine_cli_tool;
   QString exec_line = libertine_container_manager_tool;
   QStringList args;
@@ -408,6 +411,13 @@
 
   libertine_cli_tool.waitForFinished(-1);
 
+  if (libertine_cli_tool.exitCode() != 0)
+  {
+    error_msg = libertine_cli_tool.readAllStandardOutput();
+    result = false;
+  }
+
+  emit finishedConfigure(result, QString(error_msg));
   emit finished();
   quit();
 }

=== modified file 'libertine/ContainerManager.h'
--- libertine/ContainerManager.h	2016-02-11 16:25:49 +0000
+++ libertine/ContainerManager.h	2016-03-21 12:56:41 +0000
@@ -146,6 +146,7 @@
   void finishedRemove(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);
 };
 
 #endif /* CONTAINER_CONTAINERMANAGER_H_ */

=== modified file 'libertine/libertine.cpp'
--- libertine/libertine.cpp	2016-01-20 17:34:19 +0000
+++ libertine/libertine.cpp	2016-03-21 12:56:41 +0000
@@ -21,6 +21,7 @@
 #include <cstdlib>
 #include "libertine/ContainerManager.h"
 #include "libertine/ContainerAppsList.h"
+#include "libertine/ContainerArchivesList.h"
 #include "libertine/ContainerConfig.h"
 #include "libertine/ContainerConfigList.h"
 #include "libertine/libertine.h"
@@ -105,6 +106,7 @@
 
   containers_ = new ContainerConfigList(config_.data(), this);
   container_apps_ = new ContainerAppsList(containers_, this);
+  container_archives_ = new ContainerArchivesList(containers_, this);
   password_helper_ = new PasswordHelper();
 
   initialize_view();
@@ -131,6 +133,7 @@
   QQmlContext* ctxt = view_.rootContext();
   ctxt->setContextProperty("containerConfigList", containers_);
   ctxt->setContextProperty("containerAppsList", container_apps_);
+  ctxt->setContextProperty("containerArchivesList", container_archives_);
   ctxt->setContextProperty("passwordHelper", password_helper_);
 
   view_.setSource(QUrl::fromLocalFile(main_qml_source_file_));

=== modified file 'libertine/libertine.h'
--- libertine/libertine.h	2016-01-20 17:34:19 +0000
+++ libertine/libertine.h	2016-03-21 12:56:41 +0000
@@ -30,6 +30,7 @@
 class LibertineConfig;
 class PasswordHelper;
 class ContainerAppsList;
+class ContainerArchivesList;
 
 
 class Libertine
@@ -55,6 +56,7 @@
     QFileSystemWatcher              watcher_;
     ContainerConfigList*            containers_;
     ContainerAppsList*              container_apps_;
+    ContainerArchivesList*          container_archives_;
     PasswordHelper*                 password_helper_;
     QQuickView                      view_;
 };

=== modified file 'libertine/qml/ConfigureContainer.qml'
--- libertine/qml/ConfigureContainer.qml	2016-02-11 15:25:09 +0000
+++ libertine/qml/ConfigureContainer.qml	2016-03-21 12:56:41 +0000
@@ -1,5 +1,5 @@
 /**
- * @file configureContainer.qml
+ * @file ConfigureContainer.qml
  * @brief Libertine configure container view
  */
 /*
@@ -19,51 +19,49 @@
 import Libertine 1.0
 import QtQuick 2.4
 import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.2 as ListItem
 
 
 Page {
     id: configureView
     title: i18n.tr("Configure ") + mainView.currentContainer
 
-    Item {
-        visible: containerConfigList.getHostArchitecture() == 'x86_64' ? true : false
-        CheckBox {
-            id: multiarchCheckBox
-            anchors {
-                left: parent.left
-                top: parent.top
-                leftMargin: configureView.leftMargin
-            }
-            checked: containerConfigList.getContainerMultiarchSupport(mainView.currentContainer) == 'enabled' ? true : false
-            onClicked: {
-                var comp = Qt.createComponent("ContainerManager.qml")
-                if (multiarchCheckBox.checked) {
-                    var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
-                                                              "containerId": mainView.currentContainer,
-                                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                                              "data_list": ["--multiarch", "enable"]})
-                    worker.start()
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        ListItem.Standard {
+            visible: containerConfigList.getHostArchitecture() == 'x86_64' ? true : false
+            control: CheckBox {
+                checked: containerConfigList.getContainerMultiarchSupport(mainView.currentContainer) == 'enabled' ? true : false
+                onClicked: {
+                    var comp = Qt.createComponent("ContainerManager.qml")
+                    if (multiarchCheckBox.checked) {
+                        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
+                                                                  "containerId": mainView.currentContainer,
+                                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer),
+                                                                  "data_list": ["--multiarch", "enable"]})
+                        worker.start()
+                    }
+                    else {
+                        var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
+                                                                  "containerId": mainView.currentContainer,
+                                                                  "containerType": containerConfigList.getContainerType(mainView.currentContainer),
+                                                                  "data_list": ["--multiarch", "disable"]})
+                        worker.start()
+                   }
                 }
-                else {
-                    var worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
-                                                              "containerId": mainView.currentContainer,
-                                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
-                                                              "data_list": ["--multiarch", "disable"]})
-                    worker.start()
-               }
-            }
-        }
-        Label {
-            anchors {
-                left: multiarchCheckBox.right
-                right: parent.right
-                top: parent.bottom
-                verticalCenter: parent.verticalCenter
-                leftMargin: units.gu(2)
-                rightMargin: configureView.rightMargin
             }
             text: i18n.tr("i386 multiarch support")
         }
 
+        ListItem.SingleValue {
+            text: i18n.tr("Additional archives and PPAs")
+            progression: true
+            onClicked: {
+                containerArchivesList.setContainerArchives(mainView.currentContainer)
+                pageStack.push(Qt.resolvedUrl("ExtraArchivesView.qml"))
+            }
+        }
     }
 }

=== added file 'libertine/qml/ExtraArchivesView.qml'
--- libertine/qml/ExtraArchivesView.qml	1970-01-01 00:00:00 +0000
+++ libertine/qml/ExtraArchivesView.qml	2016-03-21 12:56:41 +0000
@@ -0,0 +1,167 @@
+/**
+ * @file ExtraArchiveView.qml
+ * @brief Libertine container add archive view
+ */
+/*
+ * 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 Libertine 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.2
+
+Page {
+    id: extraArchiveView
+    title: i18n.tr("Additional Archives and PPAs")
+    property var archive_name: null
+    property var worker: null
+
+    head.actions: [
+        Action {
+            iconName: "add"
+            text: i18n.tr("add")
+            description: i18n.tr("Add a new PPA")
+            onTriggered: PopupUtils.open(addArchivePopup)
+        }
+    ]
+
+    Component {
+        id: addArchivePopup
+        Dialog {
+            id: addArchiveDialog
+            title: i18n.tr("Add additional PPA")
+            text: i18n.tr("Enter name of PPA in the form ppa:user/ppa-name:")
+
+            TextField {
+                id: extraArchiveString
+                onAccepted: {
+                    PopupUtils.close(addArchiveDialog)
+                    addArchive(text)
+                }
+            }
+            Button {
+                text: i18n.tr("OK")
+                color: UbuntuColors.green
+                onClicked: {
+                    PopupUtils.close(addArchiveDialog)
+                    addArchive(extraArchiveString.text)
+                }
+            }
+            Button {
+                text: i18n.tr("Cancel")
+                color: UbuntuColors.red
+                onClicked: PopupUtils.close(addArchiveDialog)
+            }
+            Component.onCompleted: {
+                extraArchiveString.forceActiveFocus()
+            }
+        }
+    }
+
+    UbuntuListView {
+        id: extraArchiveList
+        anchors.fill: parent
+        model: containerArchivesList
+        delegate: ListItem {
+            ActivityIndicator {
+                id: extraArchiveActivity
+                anchors.verticalCenter: parent.verticalCenter
+                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 {
+                        iconName: "delete"
+                        text: i18n.tr("remove")
+                        description: i18n.tr("Remove extra archive")
+                        onTriggered: {
+                            deleteArchive(archiveName)
+                        }
+                    }
+                ]
+            }
+        }
+    }
+
+    function addArchive(archive) {
+        var comp = Qt.createComponent("ContainerManager.qml")
+        worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
+                                              "containerId": mainView.currentContainer,
+                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
+                                              "data_list": ["--add-archive", archive]})
+        worker.finishedConfigure.connect(finishedConfigure)
+        worker.start()
+    }
+
+    function deleteArchive(archive) {
+        var comp = Qt.createComponent("ContainerManager.qml")
+        worker = comp.createObject(mainView, {"containerAction": ContainerManagerWorker.Configure,
+                                              "containerId": mainView.currentContainer,
+                                              "containerType": containerConfigList.getContainerType(mainView.currentContainer),
+                                              "data_list": ["--delete-archive", archive]})
+        worker.finishedConfigure.connect(finishedConfigure)
+        worker.start()
+    }
+
+    Component {
+        id: addFailedPopup
+
+        Dialog {
+            property var error_msg: null
+            id: addFailedDialog
+            title: i18n.tr("Adding archive failed")
+            text: error_msg
+
+            Button {
+                text: i18n.tr("Dismiss")
+                onClicked: PopupUtils.close(addFailedDialog)
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        containerConfigList.configChanged.connect(reloadArchives)
+    }
+
+    Component.onDestruction: {
+        containerConfigList.configChanged.disconnect(reloadArchives)
+
+        if (worker) {
+            worker.finishedConfigure.disconnect(finishedConfigure)
+        }
+    }
+
+    function reloadArchives() {
+        containerArchivesList.setContainerArchives(mainView.currentContainer)
+    }
+
+    function finishedConfigure(result, error_msg) {
+        if (result) {
+            containerArchivesList.setContainerArchives(mainView.currentContainer)
+        }
+        else {
+            PopupUtils.open(addFailedPopup, null, {'error_msg': error_msg})
+        }
+    }  
+}

=== modified file 'liblibertine/CMakeLists.txt'
--- liblibertine/CMakeLists.txt	2015-10-07 18:59:50 +0000
+++ liblibertine/CMakeLists.txt	2016-03-21 12:56:41 +0000
@@ -11,6 +11,7 @@
   ${libertine_src}/ContainerConfig.cpp
   ${libertine_src}/ContainerManager.cpp
   ${libertine_src}/ContainerAppsList.cpp
+  ${libertine_src}/ContainerArchivesList.cpp
   ${libertine_src}/PasswordHelper.cpp
 )
 set_target_properties(libertine-common PROPERTIES

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-02-08 16:47:18 +0000
+++ python/libertine/ChrootContainer.py	2016-03-21 12:56:41 +0000
@@ -67,8 +67,9 @@
     def destroy_libertine_container(self):
         shutil.rmtree(self.root_path)
 
-    def create_libertine_container(self, password=None, verbosity=1):
+    def create_libertine_container(self, password=None, multiarch=False, verbosity=1):
         installed_release = self.get_container_distro(self.container_id)
+        architecture = utils.get_host_architecture()
 
         # Create the actual chroot
         if installed_release == "trusty":
@@ -96,7 +97,7 @@
                 fd.write("done\n")
                 os.fchmod(fd.fileno(), 0o755)
 
-        # Add universe and -updates to the chroot's sources.list
+        # Add universe, multiverse, and -updates to the chroot's sources.list
         if (utils.get_host_architecture() == 'armhf'):
             archive = "deb http://ports.ubuntu.com/ubuntu-ports "
         else:
@@ -105,9 +106,11 @@
         if verbosity == 1:
             print("Updating chroot's sources.list entries...")
         with open(os.path.join(self.root_path, 'etc', 'apt', 'sources.list'), 'a') as fd:
+            fd.write(archive + installed_release + "-updates main\n")
             fd.write(archive + installed_release + " universe\n")
-            fd.write(archive + installed_release + "-updates main\n")
             fd.write(archive + installed_release + "-updates universe\n")
+            fd.write(archive + installed_release + " multiverse\n")
+            fd.write(archive + installed_release + "-updates multiverse\n")
 
         utils.create_libertine_user_data_dir(self.container_id)
 
@@ -151,10 +154,16 @@
             args = shlex.split(command_line)
             cmd = subprocess.Popen(args).wait()
 
+        if multiarch and architecture == 'amd64':
+            if verbosity == 1:
+                print("Adding i386 multiarch support...")
+            self.run_in_container("dpkg --add-architecture i386")
+
         if verbosity == 1:
             print("Updating the contents of the container after creation...")
         self.update_packages(verbosity)
         self.install_package("libnss-extrausers", verbosity)
+        self.install_package("software-properties-common", verbosity)
 
         if verbosity == 1:
             print("Installing Matchbox as the Xmir window manager...")

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-02-10 19:31:10 +0000
+++ python/libertine/Libertine.py	2016-03-21 12:56:41 +0000
@@ -18,6 +18,7 @@
 import contextlib
 import json
 import libertine.utils
+import os
 
 
 def get_container_type(container_id):
@@ -133,10 +134,20 @@
         """
         if command == 'multiarch':
             if args[0] == 'enable':
-                self.run_in_container("dpkg --add-architecture i386")
+                return self.run_in_container("dpkg --add-architecture i386")
             else:
                 self.run_in_container(apt_command_prefix(verbosity) + "purge \".*:i386\"")
-                self.run_in_container("dpkg --remove-architecture i386")
+                return self.run_in_container("dpkg --remove-architecture i386")
+
+        elif command == 'add-archive':
+            if not os.path.exists(os.path.join(self.root_path, 'usr', 'bin', 'add-apt-repository')):
+                self.update_packages(verbosity)
+                self.install_package("software-properties-common", verbosity)
+
+            return self.run_in_container("add-apt-repository -y " + args[0])
+
+        elif command == 'delete-archive':
+            return self.run_in_container("add-apt-repository -y -r " + args[0])
 
     def get_container_distro(self, container_id):
         """
@@ -323,8 +334,8 @@
         :rtype: The output of the given command.
         """
         with ContainerRunning(self.container):
-            self.container.run_in_container(exec_line)
+            return self.container.run_in_container(exec_line)
 
     def configure_command(self, command, *args):
         with ContainerRunning(self.container):
-            self.container.configure_command(command, *args)
+            return self.container.configure_command(command, *args)

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-02-09 20:59:51 +0000
+++ python/libertine/LxcContainer.py	2016-03-21 12:56:41 +0000
@@ -189,6 +189,8 @@
             print("Updating the contents of the container after creation...")
         self.update_packages(verbosity)
 
+        self.install_package("software-properties-common", verbosity)
+
         if verbosity == 1:
             print("Installing Matchbox as the Xmir window manager...")
         self.install_package('matchbox', verbosity=verbosity)

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2015-12-23 02:34:16 +0000
+++ python/libertine/utils.py	2016-03-21 12:56:41 +0000
@@ -125,3 +125,7 @@
 def terminate_window_manager(window_manager):
     for child in window_manager.children():
         child.terminate()
+        child.wait()
+
+    window_manager.terminate()
+    window_manager.wait()

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-02-10 19:31:10 +0000
+++ tools/libertine-container-manager	2016-03-21 12:56:41 +0000
@@ -127,6 +127,64 @@
                 return container['multiarch']
 
 
+def update_archive_install_status(container_id, archive_name, new_status):
+    container_list = read_container_config_file()
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            for archive in container['extraArchives']:
+                if archive['archiveName'] == archive_name:
+                    archive['archiveStatus'] = new_status
+                    write_container_config_file(container_list)
+                    return
+
+
+def add_container_archive(container_id, archive_name):
+    container_list = read_container_config_file()
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            archive_obj = {'archiveName': archive_name, 'archiveStatus': 'new'}
+
+            if 'extraArchives' not in container:
+                container['extraArchives'] = [archive_obj]
+            else:
+                container['extraArchives'].append(archive_obj)
+
+            write_container_config_file(container_list)
+            break
+
+
+def delete_container_archive(container_id, archive_name):
+    container_list = read_container_config_file()
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            for archive in container['extraArchives']:
+                if archive['archiveName'] == archive_name:
+                    container['extraArchives'].remove(archive)
+                    write_container_config_file(container_list)
+                    return
+
+    print("%s does not exist." % archive_name)
+    sys.exit(1)
+
+
+def archive_exists(container_id, archive_name):
+    container_list = read_container_config_file()
+
+    for container in container_list['containerList']:
+        if container['id'] == container_id:
+            if 'extraArchives' not in container:
+                return False
+            else:
+                for archive in container['extraArchives']:
+                    if archive['archiveName'] == archive_name:
+                        return True
+
+    return False
+
+
 def add_new_container(id, name, type, distro):
     if not os.path.exists(libertine.utils.get_libertine_database_dir_path()):
         os.makedirs(libertine.utils.get_libertine_database_dir_path())
@@ -379,7 +437,7 @@
 
     container = LibertineContainer(args.id)
 
-    container.exec_command(args.command)
+    sys.exit(container.exec_command(args.command))
 
 
 def configure(args):
@@ -399,11 +457,36 @@
         current_multiarch = get_container_multiarch_support(args.id)
         if current_multiarch == multiarch:
             print("i386 multiarch support is already %s" % multiarch)
-            sys.exit(0)
+            sys.exit(1)
 
         container.configure_command('multiarch', args.multiarch)
         update_container_multiarch_support(args.id, multiarch)
 
+    elif args.add_archive:
+        if archive_exists(args.id, args.add_archive):
+            print("%s already added in container." % args.add_archive)
+            sys.exit(1)
+
+        add_container_archive(args.id, args.add_archive)
+        update_archive_install_status(args.id, args.add_archive, 'installing')
+        if container.configure_command('add-archive', args.add_archive) != 0:
+            delete_container_archive(args.id, args.add_archive)
+            sys.exit(1)
+
+        update_archive_install_status(args.id, args.add_archive, 'installed')
+
+
+    elif args.delete_archive:
+        if not archive_exists(args.id, args.delete_archive):
+            print("%s is not added in container." % args.delete_archive)
+            sys.exit(1)
+
+        update_archive_install_status(args.id, args.delete_archive, 'removing')
+        if container.configure_command('delete-archive', args.delete_archive) != 0:
+            sys.exit(1)
+
+        delete_container_archive(args.id, args.delete_archive)
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Legacy X application support for Unity 8")
@@ -543,6 +626,16 @@
         help=("Enables or disables i386 multiarch support for amd64 Libertine "
               "containers.   This option has no effect when the Libertine "
               "container is i386."))
+    parser_configure.add_argument(
+        '-a', '--add-archive',
+        metavar='Archive name',
+        help=("Adds an archive (PPA) in the specified Libertine container.  Needs to be "
+              "in the form of \"ppa:user/ppa-name\"."))
+    parser_configure.add_argument(
+        '-d', '--delete-archive',
+        metavar='Archive name',
+        help=("Deletes an existing archive (PPA) in the specified Libertine container.  "
+              "Needs to be in the form of \"ppa:user/ppa-name\"."))
     parser_configure.set_defaults(func=configure)
 
     # Actually parse the args