sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-07 13:41:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #538 from setrofim/next

Browse Source 
framework/entrypoint: fix joined options parsing.
This commit is contained in:
marcbonnici 2017-11-08 10:01:03 +00:00 committed by GitHub
commit 9c74e07ccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wa/framework/entrypoint.py
View File

@ -45,6 +45,22 @@ def load_commands(subparsers):
return commands return commands
# ArgumentParser.parse_known_args() does not correctly deal with concatenated
# single character options. See https://bugs.python.org/issue16142 for the
# description of the issue (with a fix attached since 2013!). To get around
# this problem, this will pre-process sys.argv to detect such joined options
# and split them.
def split_joined_options(argv):
output = []
for part in argv:
if len(part) > 1 and part[0] == '-' and part[1] != '-':
for c in part[1:]:
output.append('-' + c)
else:
output.append(part)
return output
def main(): def main():
if not os.path.exists(settings.user_directory): if not os.path.exists(settings.user_directory):
init_user_directory() init_user_directory()
@ -64,13 +80,14 @@ def main():
# to be enabled for that, which requires the verbosity setting; however # to be enabled for that, which requires the verbosity setting; however
# full argument parse cannot be complted until the commands are loaded; so # full argument parse cannot be complted until the commands are loaded; so
# parse just the base args for know so we can get verbosity. # parse just the base args for know so we can get verbosity.
args, _ = parser.parse_known_args() argv = split_joined_options(sys.argv[1:])
args, _ = parser.parse_known_args(argv)
settings.set("verbosity", args.verbose) settings.set("verbosity", args.verbose)
log.init(settings.verbosity) log.init(settings.verbosity)
# each command will add its own subparser # each command will add its own subparser
commands = load_commands(parser.add_subparsers(dest='command')) commands = load_commands(parser.add_subparsers(dest='command'))
args = parser.parse_args() args = parser.parse_args(argv)
config = ConfigManager() config = ConfigManager()
config.load_config_file(settings.user_config_file) config.load_config_file(settings.user_config_file)