Merge lp:~verterok/charms/trusty/logstash-forwarder/fix-deps-in-all-3-deploy into lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk

[Guillermo Gonzalez]

Fix install in Ubuntu versions without py2 installed, where the service didn't installed python-yaml nor python-cheetah

Fix install in Ubuntu versions without py2 installed, where the service didn't installed python-yaml nor python-cheetah, e.g: xenial + py3 charm deployed

[lp:~verterok/charms/trusty/logstash-forwarder/fix-deps-in-all-3-deploy]

19. By Guillermo Gonzalez on 2017-03-13

make install executable

20. By Guillermo Gonzalez on 2017-03-13

register install.real instead of install

[Laurent Sesquès (sajoupa)]

LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-03-07 10:46:24 +0000
+++ hooks/hooks.py	2017-03-13 19:02:13 +0000
@@ -210,7 +210,7 @@
         os.chmod(dest, 0755)
 
 
[e-mail]("install")
[e-mail]("install.real")
 def install():
     log("CHARM: Installing {}".format(conf.appName()))
     installPackages()

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2017-03-13 19:02:13 +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=('yaml' 'cheetah')
+
+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

=== renamed symlink 'hooks/install' => 'hooks/install.real'