Merge branch 'master' into autorequire
Conflicts: lib/cdist/test/emulator/__init__.py Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
commit
8ac375e8a6
3 changed files with 38 additions and 2 deletions
|
|
@ -98,10 +98,10 @@ class Emulator(object):
|
|||
|
||||
for parameter in self.cdist_type.optional_parameters:
|
||||
argument = "--" + parameter
|
||||
parser.add_argument(argument, action='store', required=False)
|
||||
parser.add_argument(argument, dest=parameter, action='store', required=False)
|
||||
for parameter in self.cdist_type.required_parameters:
|
||||
argument = "--" + parameter
|
||||
parser.add_argument(argument, action='store', required=True)
|
||||
parser.add_argument(argument, dest=parameter, action='store', required=True)
|
||||
|
||||
# If not singleton support one positional parameter
|
||||
if not self.cdist_type.is_singleton:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue