Merge lp:~gnuoy/mojo/py3-wait-nodecode into lp:~ost-maintainers/mojo/py3

Proposed by Liam Young
Status: Merged
Merged at revision: 467
Proposed branch: lp:~gnuoy/mojo/py3-wait-nodecode
Merge into: lp:~ost-maintainers/mojo/py3
Diff against target: 10 lines (+0/-2)
1 file modified
mojo/juju/wait.py (+0/-2)
To merge this branch: bzr merge lp:~gnuoy/mojo/py3-wait-nodecode
Reviewer Review Type Date Requested Status
Chris MacNaughton Approve
Review via email: mp+336772@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mojo/juju/wait.py'
--- mojo/juju/wait.py 2018-01-25 14:10:04 +0000
+++ mojo/juju/wait.py 2018-01-29 12:16:09 +0000
@@ -77,8 +77,6 @@
77 logging.error(err)77 logging.error(err)
78 logging.error("{} failed: {}".format(' '.join(cmd), p.returncode))78 logging.error("{} failed: {}".format(' '.join(cmd), p.returncode))
79 raise JujuWaitException(p.returncode or 43)79 raise JujuWaitException(p.returncode or 43)
80 if six.PY3:
81 out = out.decode('utf-8')
82 return out80 return out
8381
8482

Subscribers

People subscribed via source and target branches