Merge ~barryprice/juju-upgrader/+git/juju-upgrader:master into juju-upgrader:master

Proposed by Barry Price
Status: Merged
Approved by: Haw Loeung
Approved revision: 707202c266b8230a7414fa90751a2b76bb3782f3
Merged at revision: 4e5a017e0d5207f48d2a2073fbd539595c580fde
Proposed branch: ~barryprice/juju-upgrader/+git/juju-upgrader:master
Merge into: juju-upgrader:master
Diff against target: 20 lines (+3/-1)
1 file modified
juju-upgrader (+3/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+396112@code.launchpad.net

Commit message

The --pause argument is true by default, with no --no-pause counterpart. Fix that so we aren't force to pause.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 4e5a017e0d5207f48d2a2073fbd539595c580fde

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/juju-upgrader b/juju-upgrader
index 7de4fad..e41371d 100755
--- a/juju-upgrader
+++ b/juju-upgrader
@@ -199,13 +199,15 @@ def parse_args():
199 default=False,199 default=False,
200 help="Answer yes to any confirmation prompts. (default: False)",200 help="Answer yes to any confirmation prompts. (default: False)",
201 )201 )
202 parser.add_argument(202 group = parser.add_mutually_exclusive_group()
203 group.add_argument(
203 "--pause",204 "--pause",
204 action="store_true",205 action="store_true",
205 dest='pause',206 dest='pause',
206 default=True,207 default=True,
207 help="Pause between bunch of models. (default: True)",208 help="Pause between bunch of models. (default: True)",
208 )209 )
210 group.add_argument("--no-pause", action="store_false", dest='pause', help=argparse.SUPPRESS)
209211
210 args = parser.parse_args()212 args = parser.parse_args()
211213

Subscribers

People subscribed via source and target branches