Merge lp:~lazypower/charms/precise/haproxy/lp1363545 into lp:charms/haproxy

Proposed by Charles Butler on 2014-08-31
Status: Merged
Merged at revision: 82
Proposed branch: lp:~lazypower/charms/precise/haproxy/lp1363545
Merge into: lp:charms/haproxy
Diff against target: 12 lines (+3/-0)
1 file modified
hooks/install (+3/-0)
To merge this branch: bzr merge lp:~lazypower/charms/precise/haproxy/lp1363545
Reviewer Review Type Date Requested Status
José Antonio Rey (community) 2014-08-31 Approve on 2014-09-10
Review via email: mp+232805@code.launchpad.net

Description of the change

Adds an implicit call to installing python-yaml before kicking off the python based charm hooks.

To post a comment you must log in.
José Antonio Rey (jose) wrote :

+1 LGTM! Thanks, Chuck!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2013-08-21 20:32:34 +0000
3+++ hooks/install 2014-08-31 01:39:43 +0000
4@@ -9,5 +9,8 @@
5 juju-log 'Invoking charm-pre-install hooks'
6 [ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
7
8+# Install missing python-yaml library
9+apt-get install -y python-yaml
10+
11 juju-log 'Invoking python-based install hook'
12 python hooks/hooks.py install

Subscribers

People subscribed via source and target branches