Merge lp:~larryprice/libertine/minor-multi-package-fixes into lp:libertine

[Larry Price]

Prevent installing empty package names and appropriately update status for unstopped containers.

Fixes two issues with installing multiple packages:

1) "lcm install-package -p steam " (note the extra space) would add an empty string package to ContainersConfig.json, and mark it as successfully installed.

2) If a container does not stop after installing/removing packages, the status would remain "installing packages" or "removing packages".

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:411
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/489/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/886
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/730
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/730
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/730
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/730
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/896
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/887
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/887/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/887
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/887/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/887
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/887/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/887
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/887/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

+1

review: Approve

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2017-03-08 21:26:57 +0000
+++ python/libertine/Libertine.py	2017-03-23 14:40:48 +0000
@@ -463,7 +463,10 @@
         try:
             with ContainerRunning(self.container):
                 self.containers_config.update_container_install_status(self.container_id, "installing packages")
-                return self.container.install_package(package_name, no_dialog, update_cache)
+                retval = self.container.install_package(package_name, no_dialog, update_cache)
+
+                self.containers_config.update_container_install_status(self.container_id, "running")
+                return retval
         except RuntimeError as e:
             return handle_runtime_error(e)
 
@@ -479,7 +482,10 @@
                     os.environ['DEBIAN_FRONTEND'] = 'teletype'
 
                 self.containers_config.update_container_install_status(self.container_id, "removing packages")
-                return self.container.remove_package(package_name)
+                retval = self.container.remove_package(package_name)
+
+                self.containers_config.update_container_install_status(self.container_id, "running")
+                return retval
         except RuntimeError as e:
             return handle_runtime_error(e)
 

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2017-03-14 15:31:27 +0000
+++ tools/libertine-container-manager	2017-03-23 14:40:48 +0000
@@ -157,6 +157,9 @@
 
         with ContainerRunning(container.container):
             for i, pkg in enumerate(args.package):
+                if not pkg:
+                    continue
+
                 is_debian_package = pkg.endswith('.deb')
 
                 if is_debian_package:
@@ -212,6 +215,9 @@
 
         with ContainerRunning(container.container):
             for pkg in args.package:
+                if not pkg:
+                    continue
+
                 if self.containers_config.get_package_install_status(container_id, pkg) != 'installed':
                     libertine.utils.get_logger().error("Package \'%s\' is not installed." % pkg)
                     failure = True