Merge lp:~deej/charms/xenial/glance-simplestreams-sync/xenial-python-fix into lp:~openstack-charmers-next/charms/xenial/glance-simplestreams-sync/trunk

[David Lawson]

Work around the lack of python2.7 in Xenial as James Page did for mysql, etc.

[James Page (james-page)]

Actually I fixed this earlier in the week with a load of other proposed branches against the trunk branch of this charm - the version in the charmstore should now be published and support xenial.

[lp:~deej/charms/xenial/glance-simplestreams-sync/xenial-python-fix]

59. By David Lawson on 2016-09-08

Add install.real hook link

[James Page (james-page)]

I need to clear up all of our old cs injestion branches to avoid target confusion methinks.

Unmerged revisions

59. By David Lawson on 2016-09-08

Add install.real hook link

58. By David Lawson on 2016-09-02

Add workaround forlack of python2.7 on xenial

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-01-18 14:31:12 +0000
+++ hooks/hooks.py	2016-09-08 20:37:03 +0000
@@ -185,7 +185,7 @@
     configs.write(ID_CONF_FILE_NAME)
 
 
[e-mail]('install')
[e-mail]('install.real')
 def install():
     execd_preinstall()
     for directory in [CONF_FILE_DIR, USR_SHARE_DIR]:

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2016-09-08 20:37:03 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml' 'six')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real