Give precedence to user supplied --roles-path option (#27524)

pull/27534/head
Chris Houseknecht 7 years ago committed by GitHub
parent 16d23e96c5
commit e2651d4bac

@ -333,9 +333,9 @@ class CLI(with_metaclass(ABCMeta, object)):
def unfrack_paths(option, opt, value, parser): def unfrack_paths(option, opt, value, parser):
paths = getattr(parser.values, option.dest) paths = getattr(parser.values, option.dest)
if isinstance(value, string_types): if isinstance(value, string_types):
paths.extend([unfrackpath(x) for x in value.split(os.pathsep)]) paths[:0] = [unfrackpath(x) for x in value.split(os.pathsep)]
elif isinstance(value, list): elif isinstance(value, list):
paths.extend([unfrackpath(x) for x in value]) paths[:0] = [unfrackpath(x) for x in value]
else: else:
pass # FIXME: should we raise options error? pass # FIXME: should we raise options error?
setattr(parser.values, option.dest, paths) setattr(parser.values, option.dest, paths)

Loading…
Cancel
Save