1
=== modified file 'mojo/juju/wait.py'
2
--- mojo/juju/wait.py	2018-01-25 14:10:04 +0000
3
+++ mojo/juju/wait.py	2018-01-29 12:16:09 +0000
4
@@ -77,8 +77,6 @@
5
77
        logging.error(err)
77
        logging.error(err)
6
78
        logging.error("{} failed: {}".format(' '.join(cmd), p.returncode))
78
        logging.error("{} failed: {}".format(' '.join(cmd), p.returncode))
7
79
        raise JujuWaitException(p.returncode or 43)
79
        raise JujuWaitException(p.returncode or 43)
8
80
    if six.PY3:
9
81
        out = out.decode('utf-8')
10
82
    return out
80
    return out
11
83
81
12
84
82
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Chris MacNaughton (community)		2018-01-29	Approve on 2018-01-29
Review via email: mp+336772@code.launchpad.net
1	=== modified file 'mojo/juju/wait.py'
2	--- mojo/juju/wait.py 2018-01-25 14:10:04 +0000
3	+++ mojo/juju/wait.py 2018-01-29 12:16:09 +0000
4	@@ -77,8 +77,6 @@
5	77	logging.error(err)	77	logging.error(err)
6	78	logging.error("{} failed: {}".format(' '.join(cmd), p.returncode))	78	logging.error("{} failed: {}".format(' '.join(cmd), p.returncode))
7	79	raise JujuWaitException(p.returncode or 43)	79	raise JujuWaitException(p.returncode or 43)
8	80	if six.PY3:
9	81	out = out.decode('utf-8')
10	82	return out	80	return out
11	83		81
12	84		82