Merge lp:~timkuhlman/charms/trusty/rsyslog-forwarder-ha/deps into lp:charms/trusty/rsyslog-forwarder-ha

[Tim Kuhlman]

Explicitly install the dependencies for this package. I found this was needed for xenial as the package this is subordinate to moved to using python3 and so didn't install these anymore for python2.

[Stuart Bishop (stub)]

Looks good

review: Approve

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/4407/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4427/

review: Needs Fixing (automated testing)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-03-30 22:10:17 +0000
+++ hooks/hooks.py	2016-05-26 22:35:24 +0000
@@ -202,4 +202,6 @@
 
 
 if __name__ == "__main__":
+    if sys.argv[0].split('/')[-1] == 'hooks.py':
+        del sys.argv[0]
     hooks.execute(sys.argv)

=== 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-05-26 22:35:24 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -eu
+
+juju-log 'Ensuring dependencies are installed'
+apt-get install -y python python-apt python-yaml python-sqlalchemy
+
+juju-log 'Invoking python-based install hook'
+python hooks/hooks.py install