Juju Charms Collection
haproxy package

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

  1. Precise Pangolin (12.04)
  2. lp1363545
  3. Merge into trunk
Proposed by Charles Butler
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) Approve
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.
Revision history for this message
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
=== modified file 'hooks/install'
--- hooks/install 2013-08-21 20:32:34 +0000
+++ hooks/install 2014-08-31 01:39:43 +0000
@@ -9,5 +9,8 @@
9juju-log 'Invoking charm-pre-install hooks'9juju-log 'Invoking charm-pre-install hooks'
10[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )10[ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
1111
12# Install missing python-yaml library
13apt-get install -y python-yaml
14
12juju-log 'Invoking python-based install hook'15juju-log 'Invoking python-based install hook'
13python hooks/hooks.py install16python hooks/hooks.py install

Subscribers

People subscribed via source and target branches