summaryrefslogtreecommitdiff
diff options
authorDrew Freiberger <drew.freiberger@canonical.com>2020-07-20 11:04:00 -0500
committerDrew Freiberger <drew.freiberger@canonical.com>2020-07-23 09:47:18 -0500
commit1881adcb113dacd0ba1a99e9544ce32b6e9c4e34 (patch)
tree4518d1c5387d7a558189b7d01ec116a9208e64af
parent893375c5ddce74c70d99e2a1e9d3ee8fe98e27b6 (diff)
Add python3-pip to list of installed packagesadd-py3pip-to-install-hook
-rwxr-xr-xhooks/hooks.py4
-rwxr-xr-xhooks/install2
2 files changed, 3 insertions, 3 deletions
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 1868585..0c7798b 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -970,8 +970,8 @@ def install_hook():
apt_install(packages=INSTALL_PACKAGES, fatal=True)
-@hooks.hook('config-changed') # noqa: C901
-def config_changed():
+@hooks.hook('config-changed')
+def config_changed(): # noqa: C901
juju_log("Entering config_changed")
status_set('maintenance', 'Configuring unit')
config_data = config()
diff --git a/hooks/install b/hooks/install
index baffb57..8a1f051 100755
--- a/hooks/install
+++ b/hooks/install
@@ -2,7 +2,7 @@
# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
# by default.
-declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml' 'python3-pip')
wait_for_dpkg_unlock() {
while $(fuser -s /var/lib/dpkg/lock); do sleep .5;done