maas-images

Merge lp:~ltrager/maas-images/legacy_proposed into lp:maas-images

  1. legacy_proposed
  2. Merge into maas-ephemerals
Proposed by Lee Trager
Status: Merged
Merged at revision: 395
Proposed branch: lp:~ltrager/maas-images/legacy_proposed
Merge into: lp:maas-images
Diff against target: 26 lines (+2/-3)
2 files modified
meph2/commands/flags.py (+2/-0)
meph2/commands/mimport.py (+0/-3)
To merge this branch: bzr merge lp:~ltrager/maas-images/legacy_proposed
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+343561@code.launchpad.net

Commit message

Add proposed to global set of flags so it works with meph2-util import as well as meph2-import

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'meph2/commands/flags.py'
2--- meph2/commands/flags.py 2017-05-02 07:31:59 +0000
3+++ meph2/commands/flags.py 2018-04-18 21:27:06 +0000
4@@ -42,6 +42,8 @@
5 COMMON_FLAGS['no-sign'], COMMON_FLAGS['keyring'],
6 ('import_cfg', {'help':
7 'The config file for the image to import.'}),
8+ ('proposed', {'help': 'Pull bootloaders from proposed',
9+ 'action': 'store_true', 'default': False}),
10 COMMON_FLAGS['target'],
11 COMMON_FLAGS['max'],
12 ]
13
14=== modified file 'meph2/commands/mimport.py'
15--- meph2/commands/mimport.py 2018-04-09 19:53:33 +0000
16+++ meph2/commands/mimport.py 2018-04-18 21:27:06 +0000
17@@ -309,9 +309,6 @@
18 args = [args]
19 parser.add_argument(*args, **kwargs)
20 parser.set_defaults(action=main_import)
21- parser.add_argument(
22- '--proposed', help='Pull bootloaders from proposed',
23- action='store_true', default=False)
24
25 args = parser.parse_args()
26 if not getattr(args, 'action', None):

Subscribers

People subscribed via source and target branches