Juju Charm Tools

Merge lp:~niedbalski/charm-tools/fix-lp-1303825 into lp:charm-tools/1.2

  1. fix-lp-1303825
  2. Merge into 1.2
Proposed by Jorge Niedbalski
Status: Merged
Merged at revision: 318
Proposed branch: lp:~niedbalski/charm-tools/fix-lp-1303825
Merge into: lp:charm-tools/1.2
Diff against target: 12 lines (+1/-1)
1 file modified
helpers/sh/net.sh (+1/-1)
To merge this branch: bzr merge lp:~niedbalski/charm-tools/fix-lp-1303825
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+214551@code.launchpad.net

Description of the change

Fix for public bug #1303825

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Charm helpers is no longer packaged and distributed, so this will never make it into a package that will be installed charm store wide. I'm happy to merge this request but would like for you to know

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helpers/sh/net.sh'
2--- helpers/sh/net.sh 2012-09-05 18:33:43 +0000
3+++ helpers/sh/net.sh 2014-04-07 14:27:19 +0000
4@@ -171,7 +171,7 @@
5
6 if [ ! `ch_is_ip "$CHECK_IP"` ]; then
7 # Try a dig, why not?
8- CHECK_IP=$(dig +short $HOST | awk 'NR==1{ print $1 }')
9+ CHECK_IP=$(dig +short $HOST | tac | awk 'NR==1{ print $1 }')
10
11 if [ ! `ch_is_ip "$CHECK_IP"` ]; then
12 return 1

Subscribers

People subscribed via source and target branches

to all changes: