Juju Charms Collection
haproxy package

Merge lp:~dpb/charms/precise/haproxy/trunk into lp:charms/haproxy

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into trunk
Proposed by David Britton
Status: Merged
Approved by: Mark Mims
Approved revision: no longer in the source branch.
Merged at revision: 67
Proposed branch: lp:~dpb/charms/precise/haproxy/trunk
Merge into: lp:charms/haproxy
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~dpb/charms/precise/haproxy/trunk
Reviewer Review Type Date Requested Status
Mark Mims (community) Approve
Review via email: mp+165508@code.launchpad.net

Description of the change

nearly trivial change.

Change dump() to safe_dump() to make sure "!!python/unicode" and other non-valid yaml doesn't accidently get written out into the exchange.

To post a comment you must log in.
Revision history for this message
Mark Mims (mark-mims) wrote :

lgtm

review: Approve
lp:~dpb/charms/precise/haproxy/trunk updated
67. By Mark Mims

merging lp:~davidpbritton/charms/precise/haproxy/trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2013-02-14 21:35:47 +0000
3+++ hooks/hooks.py 2013-05-24 00:33:30 +0000
4@@ -708,7 +708,7 @@
5 my_host = socket.gethostname()
6 subprocess.call(
7 ['relation-set', 'port=%d' % my_port, 'hostname=%s' % my_host,
8- 'all_services=%s' % yaml.dump(get_all_services())])
9+ 'all_services=%s' % yaml.safe_dump(get_all_services())])
10 if hook_name == "changed":
11 if 'is-proxy' in relation_data:
12 service_name = "%s__%d" % \

Subscribers

People subscribed via source and target branches