From d4c5e4496bea402c132f39f868d4ffba483c8ca0 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Thu, 31 Jul 2014 13:40:51 -0700
Subject: [PATCH] Ensure python-apt is installed by the bootstrap script for
 Debian & Ubuntu minions.

---
 bootstrap-salt.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 94d77f5..31c0c78 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1648,6 +1648,9 @@ install_ubuntu_deps() {
     # Minimal systems might not have upstart installed, install it
     __apt_get_install_noinput upstart
 
+    # Need python-apt for managing packages via Salt
+    __apt_get_install_noinput python-apt
+
     if [ "$DISTRO_MAJOR_VERSION" -gt 12 ] || ([ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$DISTRO_MINOR_VERSION" -gt 03 ]); then
         __apt_get_install_noinput python-requests
         __PIP_PACKAGES=""
@@ -1980,6 +1983,9 @@ _eof
     # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
     __apt_get_install_noinput python-requests python-pip procps pciutils
 
+    # Need python-apt for managing packages via Salt
+    __apt_get_install_noinput python-apt
+
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
         check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud"
         __apt_get_install_noinput python-pip
@@ -2047,14 +2053,14 @@ _eof
 
         apt-get update
         __apt_get_install_noinput -t unstable libzmq3 libzmq3-dev || return 1
-        __PACKAGES="build-essential python-dev python-pip python-requests"
+        __PACKAGES="build-essential python-dev python-pip python-requests python-apt"
         # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
         __PACKAGES="${__PACKAGES} procps pciutils"
         # shellcheck disable=SC2086
         __apt_get_install_noinput ${__PACKAGES} || return 1
     else
         apt-get update || return 1
-        __PACKAGES="python-zmq python-requests"
+        __PACKAGES="python-zmq python-requests python-apt"
         # Additionally install procps and pciutils which allows for Docker boostraps. See 366#issuecomment-39666813
         __PACKAGES="${__PACKAGES} procps pciutils"
         # shellcheck disable=SC2086