python-jujuclient

Merge lp:~paulgear/python-jujuclient/juju-show-model-fix into lp:python-jujuclient

  1. juju-show-model-fix
  2. Merge into trunk
Proposed by Paul Gear
Status: Rejected
Rejected by: Paul Gear
Proposed branch: lp:~paulgear/python-jujuclient/juju-show-model-fix
Merge into: lp:python-jujuclient
Diff against target: 12 lines (+1/-1)
1 file modified
jujuclient/juju2/connector.py (+1/-1)
To merge this branch: bzr merge lp:~paulgear/python-jujuclient/juju-show-model-fix
Reviewer Review Type Date Requested Status
juju-deployers Pending
Review via email: mp+302903@code.launchpad.net

Description of the change

juju show-model now requires -m flag

To post a comment you must log in.

Unmerged revisions

92. By Paul Gear

juju show-model now requires the -m flag to specify the model

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jujuclient/juju2/connector.py'
2--- jujuclient/juju2/connector.py 2016-08-11 16:29:41 +0000
3+++ jujuclient/juju2/connector.py 2016-08-15 05:39:20 +0000
4@@ -98,7 +98,7 @@
5 model = '{}:{}'.format(controller_name, model_name)
6 try:
7 output = subprocess.check_output(
8- ['juju', 'show-model', model, '--format=yaml'])
9+ ['juju', 'show-model', '-m', model, '--format=yaml'])
10 except subprocess.CalledProcessError:
11 raise EnvironmentNotBootstrapped(env_name)
12 return yaml.safe_load(output)[model_name]

Subscribers

People subscribed via source and target branches

to all changes: