hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix multi-word aliases (#41126)

Browse source 
PR #40929 reverted the argument parsing to make `spack --verbose
install` work again. It looks like `--verbose` is the only instance
where this kind of argument inheritance is used since all other commands
override arguments with the same name instead. For instance, `spack
--bootstrap clean` does not invoke `spack clean --bootstrap`.

Therefore, fix multi-line aliases again by parsing the resolved
arguments and instead explicitly pass down `args.verbose` to commands.
This commit is contained in:
Michael Kuhn 2023-11-24 15:56:42 +01:00 committed by GitHub
parent 92d076e683
commit 7db386a018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/spack/spack/main.py
View file

@ -1016,14 +1016,16 @@ def _main(argv=None):
bootstrap_context = bootstrap.ensure_bootstrap_configuration() bootstrap_context = bootstrap.ensure_bootstrap_configuration()
with bootstrap_context: with bootstrap_context:
return finish_parse_and_run(parser, cmd_name, args.command, env_format_error) return finish_parse_and_run(parser, cmd_name, args, env_format_error)
def finish_parse_and_run(parser, cmd_name, cmd, env_format_error): def finish_parse_and_run(parser, cmd_name, main_args, env_format_error):
"""Finish parsing after we know the command to run.""" """Finish parsing after we know the command to run."""
# add the found command to the parser and re-run then re-parse # add the found command to the parser and re-run then re-parse
command = parser.add_command(cmd_name) command = parser.add_command(cmd_name)
args, unknown = parser.parse_known_args() args, unknown = parser.parse_known_args(main_args.command)
# we need to inherit verbose since the install command checks for it
args.verbose = main_args.verbose
# Now that we know what command this is and what its args are, determine # Now that we know what command this is and what its args are, determine
# whether we can continue with a bad environment and raise if not. # whether we can continue with a bad environment and raise if not.