Charm Helpers

Merge lp:~nick-moffitt/charm-helpers/fix-rsync-output-munging into lp:charm-helpers

  1. fix-rsync-output-munging
  2. Merge into devel
Proposed by Nick Moffitt
Status: Merged
Approved by: Matthew Wedgwood
Approved revision: 13
Merged at revision: 14
Proposed branch: lp:~nick-moffitt/charm-helpers/fix-rsync-output-munging
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/core/host.py (+1/-1)
To merge this branch: bzr merge lp:~nick-moffitt/charm-helpers/fix-rsync-output-munging
Reviewer Review Type Date Requested Status
Matthew Wedgwood (community) Approve
Review via email: mp+166276@code.launchpad.net

Description of the change

I think in an older version of this, I used a different function that returned an exception-like object (hence the need to get foo.output to see the string). At any rate, this merge fixes the rsync function so that it actually works instead of bombing out.

To post a comment you must log in.
Revision history for this message
Matthew Wedgwood (mew) wrote :

Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/core/host.py'
2--- charmhelpers/core/host.py 2013-05-22 21:11:01 +0000
3+++ charmhelpers/core/host.py 2013-05-29 15:01:40 +0000
4@@ -73,7 +73,7 @@
5 cmd.append(from_path.format(**context))
6 cmd.append(to_path.format(**context))
7 log(" ".join(cmd))
8- return subprocess.check_output(cmd).output.strip()
9+ return subprocess.check_output(cmd).strip()
10
11
12 def symlink(source, destination):

Subscribers

People subscribed via source and target branches