Merge lp:~clint-fewbar/charms/precise/haproxy/trunk into lp:charms/haproxy

Proposed by Clint Byrum
Status: Rejected
Rejected by: Marco Ceppi
Proposed branch: lp:~clint-fewbar/charms/precise/haproxy/trunk
Merge into: lp:charms/haproxy
Diff against target: 19 lines (+2/-2)
1 file modified
hooks/hooks.py (+2/-2)
To merge this branch: bzr merge lp:~clint-fewbar/charms/precise/haproxy/trunk
Reviewer Review Type Date Requested Status
Juan L. Negron (community) Approve
Review via email: mp+129782@code.launchpad.net

Description of the change

Fixes deploying with bzr-branched juju by removing explicit path from open/close port.

To post a comment you must log in.
Revision history for this message
Juan L. Negron (negronjl) wrote :

LGTM.

-Juan

review: Approve
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Merged in other branch!

Unmerged revisions

61. By Clint Byrum on 2012-10-15

Do not use explicit port for open/close port

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 2012-10-03 14:23:29 +0000
3+++ hooks/hooks.py 2012-10-15 22:44:19 +0000
4@@ -186,7 +186,7 @@
5 def open_port(port=None, protocol="TCP"):
6 if port is None:
7 return(None)
8- return(subprocess.call(['/usr/bin/open-port', "%d/%s" %
9+ return(subprocess.call(['open-port', "%d/%s" %
10 (int(port), protocol)]))
11
12
13@@ -197,7 +197,7 @@
14 def close_port(port=None, protocol="TCP"):
15 if port is None:
16 return(None)
17- return(subprocess.call(['/usr/bin/close-port', "%d/%s" %
18+ return(subprocess.call(['close-port', "%d/%s" %
19 (int(port), protocol)]))
20
21

Subscribers

People subscribed via source and target branches