Merge lp:~chris.macnaughton/mojo/error-output into lp:~ost-maintainers/mojo/py3

Proposed by Chris MacNaughton on 2018-07-25
Status: Merged
Merged at revision: 473
Proposed branch: lp:~chris.macnaughton/mojo/error-output
Merge into: lp:~ost-maintainers/mojo/py3
Diff against target: 19 lines (+1/-6)
1 file modified
mojo/phase.py (+1/-6)
To merge this branch: bzr merge lp:~chris.macnaughton/mojo/error-output
Reviewer Review Type Date Requested Status
Frode Nordahl 2018-07-25 Approve on 2018-07-25
Review via email: mp+350832@code.launchpad.net
To post a comment you must log in.
Frode Nordahl (fnordahl) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mojo/phase.py'
2--- mojo/phase.py 2018-07-17 11:57:20 +0000
3+++ mojo/phase.py 2018-07-25 12:38:54 +0000
4@@ -988,14 +988,9 @@
5 dl = mojo.juju.DebugLogs(
6 workspace, stage, self.options.get('debug-logs'), self.options.get('debug-logs-stages-to-exclude'))
7 if dl.has_config:
8- output = e.output
9- if six.PY3:
10- output = output.decode('utf-8')
11- exception_output = "{}\n{}".format(output, dl.get_log_output())
12+ exception_output = "{}\n{}".format(e.output, dl.get_log_output())
13 else:
14 exception_output = e.output
15- if six.PY3:
16- exception_output = exception_output.decode('utf-8')
17 raise VerifyPhaseException(exception_output)
18 else:
19 # Hooray, success!

Subscribers

People subscribed via source and target branches