Merge lp:~townsend/libertine/1.4.2-release into lp:libertine/trunk

[Christopher Townsend]

* Add a new update_apt_cache method and call that when needed, especially when installing new packages. (LP: #1625627)
* Install matchbox-window-manager instead of the matchbox metapackage in a container. (LP: #1628563)
* Remove bad status update preventing archive removal from container.
* Make debconf interactions work correctly from GUI. (LP: #1627757)
* Fix crash on start in Unity 7 when launching from the dash. (LP: #1620016)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-14 14:46:03 +0000
+++ debian/changelog	2016-10-03 19:45:57 +0000
@@ -1,3 +1,19 @@
+libertine (1.4.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Add a new update_apt_cache method and call that when needed, especially
+    when installing new packages. (LP: #1625627)
+  * Install matchbox-window-manager instead of the matchbox metapackage in
+    a container. (LP: #1628563)
+
+  [ Larry Price ]
+  * Remove bad status update preventing archive removal from container.
+  * Make debconf interactions work correctly from GUI. (LP: #1627757)
+  * Fix crash on start in Unity 7 when launching from the dash.
+    (LP: #1620016)
+
+ -- Chris Townsend <[e-mail]>  Mon, 03 Oct 2016 15:30:24 -0400
+
 libertine (1.4.1+16.10.20160914-0ubuntu1) yakkety; urgency=medium
 
   [ Brandon Schaefer ]

=== modified file 'libertine/ContainerManager.cpp'
--- libertine/ContainerManager.cpp	2016-07-12 15:52:21 +0000
+++ libertine/ContainerManager.cpp	2016-10-03 19:45:57 +0000
@@ -159,7 +159,7 @@
      emit operationFinished(container_id, package_name);
   });
 
-  process_.start(libertine_container_manager_tool, QStringList{"install-package", "-i", container_id, "-p", package_name, "-r"});
+  process_.start(libertine_container_manager_tool, QStringList{"install-package", "-i", container_id, "-p", package_name, "--no-dialog"});
 }
 
 
@@ -183,7 +183,7 @@
     emit operationFinished(container_id, package_name);
   });
 
-  process_.start(libertine_container_manager_tool, QStringList{"remove-package", "-i", container_id, "-p", package_name, "-r"});
+  process_.start(libertine_container_manager_tool, QStringList{"remove-package", "-i", container_id, "-p", package_name, "--no-dialog"});
 }
 
 

=== modified file 'libertine/libertine.cpp'
--- libertine/libertine.cpp	2016-07-15 18:39:58 +0000
+++ libertine/libertine.cpp	2016-10-03 19:45:57 +0000
@@ -84,7 +84,7 @@
  * environment variables, and configurations files and displays the GUI.
  */
 Libertine::
-Libertine(int argc, char* argv[])
+Libertine(int& argc, char** argv)
 : QGuiApplication(argc, argv)
 , main_qml_source_file_(find_main_qml_source_file())
 {

=== modified file 'libertine/libertine.h'
--- libertine/libertine.h	2016-07-15 18:39:58 +0000
+++ libertine/libertine.h	2016-10-03 19:45:57 +0000
@@ -38,7 +38,7 @@
   Q_OBJECT
 
 public:
-    Libertine(int argc, char* argv[]);
+    Libertine(int& argc, char** argv);
     ~Libertine();
 
 private:

=== modified file 'libertine/qml/ExtraArchivesView.qml'
--- libertine/qml/ExtraArchivesView.qml	2016-07-13 19:48:48 +0000
+++ libertine/qml/ExtraArchivesView.qml	2016-10-03 19:45:57 +0000
@@ -96,18 +96,16 @@
     function deleteArchive(archive) {
         var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
         worker.finishedConfigure.connect(finishedConfigure)
-        worker.error.connect(sendDeleteError)
+        worker.error.connect(mainView.error)
         worker.configureContainer(currentContainer, containerConfigList.getContainerName(currentContainer), ["--archive", "remove", "--archive-name", "\"" + archive + "\""])
     }
 
     Component.onCompleted: {
         containerConfigList.configChanged.connect(reloadArchives)
-        error.connect(mainView.error)
     }
 
     Component.onDestruction: {
         containerConfigList.configChanged.disconnect(reloadArchives)
-        error.disconnect(mainView.error)
     }
 
     function reloadArchives() {
@@ -121,8 +119,4 @@
             containerArchivesList.setContainerArchives(currentContainer)
         }
     }
-
-    function sendDeleteError(desc, details) {
-        error(i18n.tr("Deleting archive failed"), details)
-    }
 }

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-09-06 12:36:47 +0000
+++ python/libertine/ChrootContainer.py	2016-10-03 19:45:57 +0000
@@ -122,7 +122,7 @@
         self.update_packages(verbosity)
 
         for package in self.default_packages:
-            if not self.install_package(package, verbosity):
+            if not self.install_package(package, verbosity, update_cache=False):
                 print("Failure installing %s during container creation" % package)
                 self.destroy_libertine_container()
                 return False
@@ -130,7 +130,7 @@
         if self.installed_release == "vivid":
             if verbosity == 1:
                 print("Installing the Vivid Stable Overlay PPA...")
-            if not self.install_package("software-properties-common", verbosity):
+            if not self.install_package("software-properties-common", verbosity, update_cache=False):
                 print("Failure installing software-properties-common during container creation")
                 self.destroy_libertine_container()
                 return False
@@ -148,8 +148,8 @@
         self._run_ldconfig(verbosity)
         return retcode
 
-    def install_package(self, package_name, verbosity=1, readline=False):
-        returncode = super().install_package(package_name, verbosity, readline)
+    def install_package(self, package_name, verbosity=1, no_dialog=False, update_cache=True):
+        returncode = super().install_package(package_name, verbosity, no_dialog, update_cache)
 
         if returncode:
             self._run_ldconfig(verbosity)

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-09-06 12:36:47 +0000
+++ python/libertine/Libertine.py	2016-10-03 19:45:57 +0000
@@ -67,7 +67,7 @@
         self.container_type = 'unknown'
         self.container_id = container_id
         self.root_path = libertine.utils.get_libertine_container_rootfs_path(self.container_id)
-        self.default_packages = ['matchbox',
+        self.default_packages = ['matchbox-window-manager',
                                  'libnss-extrausers',
                                  'humanity-icon-theme',
                                  'maliit-inputcontext-gtk2',
@@ -133,16 +133,24 @@
         """
         pass
 
+    def update_apt_cache(self, verbosity=1):
+        """
+        Updates the apt cache in the container.
+
+        :param verbosity: the chattiness of the output on a range from 0 to 2
+        """
+        return self.run_in_container(apt_command_prefix(verbosity) + 'update')
+
     def update_packages(self, verbosity=1):
         """
         Updates all packages installed in the container.
 
         :param verbosity: the chattiness of the output on a range from 0 to 2
         """
-        self.run_in_container(apt_command_prefix(verbosity) + '--force-yes update')
+        self.update_apt_cache(verbosity)
         return self.run_in_container(apt_command_prefix(verbosity) + '--force-yes dist-upgrade')
 
-    def install_package(self, package_name, verbosity=1, readline=False):
+    def install_package(self, package_name, verbosity=1, no_dialog=False, update_cache=True):
         """
         Installs a named package in the container.
 
@@ -150,6 +158,9 @@
                              a full path to a Debian package on the host.
         :param verbosity: the chattiness of the output on a range from 0 to 2
         """
+        if update_cache:
+            self.update_apt_cache(verbosity)
+
         if package_name.endswith('.deb'):
             delete_package = self.copy_package_to_container(package_name)
 
@@ -164,8 +175,8 @@
 
             return ret
         else:
-            if readline:
-                os.environ['DEBIAN_FRONTEND'] = 'readline'
+            if no_dialog:
+                os.environ['DEBIAN_FRONTEND'] = 'teletype'
             return self.run_in_container(apt_command_prefix(verbosity) + " install '" + package_name + "'") == 0
 
     def configure_multiarch(self, should_enable, verbosity=1):
@@ -178,7 +189,7 @@
         if should_enable:
             ret = self.run_in_container("dpkg --add-architecture i386")
             if ret or ret == 0:
-                self.run_in_container(apt_command_prefix(verbosity) + '--force-yes update')
+                self.update_apt_cache(verbosity)
             return ret
         else:
             self.run_in_container(apt_command_prefix(verbosity) + "purge \".*:i386\"")
@@ -193,10 +204,8 @@
         :param verbosity: the chattiness of the output on a range from 0 to 2
         """
         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)
         if 'https://' in archive and not os.path.exists(os.path.join(self.root_path, 'usr', 'lib', 'apt', 'methods', 'https')):
-            self.update_packages(verbosity)
             self.install_package("apt-transport-https", verbosity)
 
         retcode = self.run_in_container("add-apt-repository -y " + archive)
@@ -332,17 +341,17 @@
         except RuntimeError as e:
             return handle_runtime_error(e)
 
-    def install_package(self, package_name, verbosity=1, readline=False):
+    def install_package(self, package_name, verbosity=1, no_dialog=False, update_cache=True):
         """
         Installs a package in the container.
         """
         try:
             with ContainerRunning(self.container):
-                return self.container.install_package(package_name, verbosity, readline)
+                return self.container.install_package(package_name, verbosity, no_dialog, update_cache)
         except RuntimeError as e:
             return handle_runtime_error(e)
 
-    def remove_package(self, package_name, verbosity=1, readline=False):
+    def remove_package(self, package_name, verbosity=1, no_dialog=False):
         """
         Removes a package from the container.
 
@@ -351,8 +360,8 @@
         """
         try:
             with ContainerRunning(self.container):
-                if readline:
-                    os.environ['DEBIAN_FRONTEND'] = 'readline'
+                if no_dialog:
+                    os.environ['DEBIAN_FRONTEND'] = 'teletype'
 
                 if self.container.run_in_container(apt_command_prefix(verbosity) + " purge '" + package_name + "'") != 0:
                     return False

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-09-07 19:08:12 +0000
+++ python/libertine/LxcContainer.py	2016-10-03 19:45:57 +0000
@@ -240,7 +240,7 @@
         self.update_packages(verbosity)
 
         for package in self.default_packages:
-            if not self.install_package(package, verbosity):
+            if not self.install_package(package, verbosity, update_cache=False):
                 print("Failure installing %s during container creation" % package)
                 self.destroy_libertine_container()
                 return False

=== modified file 'tools/completions/libertine-container-manager'
--- tools/completions/libertine-container-manager	2016-07-22 15:05:22 +0000
+++ tools/completions/libertine-container-manager	2016-10-03 19:45:57 +0000
@@ -24,10 +24,10 @@
     if [[ ${cur} == -* ]]; then
       case "${cmd}" in
       "install-package" )
-        opts="--help --id --package --readline"
+        opts="--help --id --package --no-dialog"
         ;;
       "remove-package" )
-        opts="--help --id --package --readline"
+        opts="--help --id --package --no-dialog"
         ;;
       "create" )
         opts="--help --id --type --distro --name --force --multiarch --password"

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-09-06 12:36:47 +0000
+++ tools/libertine-container-manager	2016-10-03 19:45:57 +0000
@@ -136,7 +136,7 @@
         container = LibertineContainer(container_id)
 
         self.containers_config.update_package_install_status(container_id, package, "installing")
-        if not container.install_package(args.package, args.verbosity, args.readline):
+        if not container.install_package(args.package, args.verbosity, args.no_dialog):
             self.containers_config.delete_package(container_id, package)
             sys.exit(1)
 
@@ -144,12 +144,12 @@
 
         libertine.utils.refresh_libertine_scope()
 
-    def remove_package_by_name(self, container_id, package_name, verbosity=1, readline=False):
+    def remove_package_by_name(self, container_id, package_name, verbosity=1, no_dialog=False):
         fallback_status = self.containers_config.get_package_install_status(container_id, package_name)
         self.containers_config.update_package_install_status(container_id, package_name, "removing")
 
         container = LibertineContainer(container_id)
-        if not container.remove_package(package_name, verbosity, readline) and fallback_status == 'installed':
+        if not container.remove_package(package_name, verbosity, no_dialog) and fallback_status == 'installed':
             self.containers_config.update_package_install_status(container_id, package_name, fallback_status)
             return False
 
@@ -165,7 +165,7 @@
             print("Package \'%s\' is not installed." % args.package)
             sys.exit(1)
 
-        if not self.remove_package_by_name(container_id, args.package, args.verbosity, args.readline):
+        if not self.remove_package_by_name(container_id, args.package, args.verbosity, args.no_dialog):
             sys.exit(1)
 
         libertine.utils.refresh_libertine_scope()
@@ -209,7 +209,6 @@
             sys.exit(1)
 
     def delete_archive_by_name(self, container_id, archive_name, verbosity=1):
-        self.containers_config.update_archive_install_status(container_id, archive_name, 'removing')
         if self.containers_config.get_archive_install_status(container_id, archive_name) == 'installed':
             self.containers_config.update_archive_install_status(container_id, archive_name, 'removing')
             if LibertineContainer(container_id).configure_remove_archive("\"" + archive_name + "\"", verbosity) is not 0:
@@ -371,8 +370,8 @@
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
     parser_install.add_argument(
-        '-r', '--readline', action='store_true',
-        help=("Readline mode. Use text-based frontend during debconf interactions."))
+        '-n', '--no-dialog', action='store_true',
+        help=("No dialog mode. Use text-based frontend during debconf interactions."))
     parser_install.set_defaults(func=container_manager.install_package)
 
     # Handle the remove-package command and its options
@@ -387,8 +386,8 @@
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
     parser_remove.add_argument(
-        '-r', '--readline', action='store_true',
-        help=("Readline mode. Use text-based frontend during debconf interactions."))
+        '-n', '--no-dialog', action='store_true',
+        help=("No dialog mode. Use text-based frontend during debconf interactions."))
     parser_remove.set_defaults(func=container_manager.remove_package)
 
     # Handle the search-cache command and its options

=== modified file 'tools/libertine-container-manager.1'
--- tools/libertine-container-manager.1	2016-09-06 12:36:47 +0000
+++ tools/libertine-container-manager.1	2016-10-03 19:45:57 +0000
@@ -146,6 +146,11 @@
 .RS 14
 Name of package to install. Required.
 .RE
+.IP
+.BR \-n ", " \-\-no-dialog ""
+.RS 14
+No dialog mode. Use text-based frontend during debconf interactions.
+.RE
 .TP
 
 .B libertine-container-manager remove-package [options]
@@ -165,6 +170,11 @@
 .RS 14
 Name of package to remove. Required.
 .RE
+.IP
+.BR \-n ", " \-\-no-dialog ""
+.RS 14
+No dialog mode. Use text-based frontend during debconf interactions.
+.RE
 .TP
 
 .B libertine-container-manager search-cache [options]