Mojo: Continuous Delivery for Juju

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

  1. py3-secrets
  2. Merge into py3
Proposed by Liam Young
Status: Merged
Merged at revision: 466
Proposed branch: lp:~gnuoy/mojo/py3-secrets
Merge into: lp:~ost-maintainers/mojo/py3
Diff against target: 15 lines (+4/-1)
1 file modified
mojo/phase.py (+4/-1)
To merge this branch: bzr merge lp:~gnuoy/mojo/py3-secrets
Reviewer Review Type Date Requested Status
Chris MacNaughton (community) Approve
Review via email: mp+336770@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
1=== modified file 'mojo/phase.py'
2--- mojo/phase.py 2018-01-25 14:10:04 +0000
3+++ mojo/phase.py 2018-01-29 11:52:15 +0000
4@@ -581,7 +581,10 @@
5 if os.path.isfile(config):
6 cmd.extend(['-c', config])
7 cmd.extend(["-l"])
8- target = subprocess.check_output(cmd).split("\n")[0]
9+ output = subprocess.check_output(cmd)
10+ if six.PY3:
11+ output = output.decode('utf-8')
12+ target = output.split("\n")[0]
13 return target
14
15 def _validate_configs(self, configs):

Subscribers

People subscribed via source and target branches