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

[Christopher Townsend]

Hotfixes for the 1.3 release:
- Install software-properties-common in vivid chroot containers before adding stable overlay.
- Update bash completions for new configure syntax.

[Larry Price (larryprice)]

+1

review: Approve

[lp:~townsend/libertine/release-hotfixes]

144. By Christopher Townsend on 2016-07-22

Add own debian/changelog entries.

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-21 17:26:54 +0000
+++ debian/changelog	2016-07-22 16:44:05 +0000
@@ -1,3 +1,13 @@
+libertine (1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Larry Price ]
+  * Hotfixes for the 1.3 release:
+    - Install software-properties-common in vivid chroot containers before
+      adding stable overlay.
+    - Update bash completions for new configure syntax. 
+
+ -- Chris Townsend <[e-mail]>  Fri, 22 Jul 2016 12:41:58 -0400
+
 libertine (1.3+16.10.20160721.2-0ubuntu1) yakkety; urgency=medium
 
   [ Brandon Schaefer ]

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-07-01 16:48:11 +0000
+++ python/libertine/ChrootContainer.py	2016-07-22 16:44:05 +0000
@@ -127,6 +127,11 @@
         if self.installed_release == "vivid":
             if verbosity == 1:
                 print("Installing the Vivid Stable Overlay PPA...")
+            if not self.install_package("software-properties-common", verbosity):
+                print("Failure installing software-properties-common during container creation")
+                self.destroy_libertine_container()
+                return False
+
             self.run_in_container("add-apt-repository ppa:ci-train-ppa-service/stable-phone-overlay -y")
             self.update_packages(verbosity)
 

=== modified file 'tools/completions/libertine-container-manager'
--- tools/completions/libertine-container-manager	2016-06-07 19:49:27 +0000
+++ tools/completions/libertine-container-manager	2016-07-22 16:44:05 +0000
@@ -48,7 +48,7 @@
         opts="--help"
         ;;
       "configure" )
-        opts="--help --id --multiarch --add-archive --delete-archive"
+        opts="--help --id --multiarch --archive"
         ;;
       "set-default" )
         opts="--help --id --clear"
@@ -59,8 +59,14 @@
       esac
     fi
 
-    if [[ ${cmd} == "configure" && "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]]; then
-      opts="enable disable"
+    if [[ ${cmd} == "configure" ]]; then
+      if [[ "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]]; then
+        opts="enable disable"
+      elif [[ "${COMP_WORDS[COMP_CWORD-1]}" == "--archive" ]]; then
+        opts="add remove"
+      elif [[ " ${COMP_WORDS[@]} " =~ " --archive " ]]; then
+        opts="--archive-name --public-key-file"
+      fi
     fi
 
     if [[ -z ${opts} && "${COMP_CWORD}" == "1" ]]; then