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

Remove erroneous warnings about quotes for from_source_file (#22767)

Browse source
This commit is contained in:
Adam J. Stewart 2021-04-06 00:13:54 -05:00 committed by Todd Gamblin
parent 43cea1b354
commit 2496c7b514
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/spack/spack/util/environment.py
View file

@ -942,7 +942,9 @@ def _source_single_file(file_and_args, environment):
source_file, suppress_output, source_file, suppress_output,
concatenate_on_success, dump_environment, concatenate_on_success, dump_environment,
]) ])
output = shell(source_file_arguments, output=str, env=environment) output = shell(
source_file_arguments, output=str, env=environment, ignore_quotes=True
)
environment = json.loads(output) environment = json.loads(output)
# If we're in python2, convert to str objects instead of unicode # If we're in python2, convert to str objects instead of unicode

24
lib/spack/spack/util/executable.py
View file

@ -92,6 +92,8 @@ def __call__(self, *args, **kwargs):
ignore_errors (int or list): A list of error codes to ignore. ignore_errors (int or list): A list of error codes to ignore.
If these codes are returned, this process will not raise If these codes are returned, this process will not raise
an exception even if ``fail_on_error`` is set to ``True`` an exception even if ``fail_on_error`` is set to ``True``
ignore_quotes (bool): If False, warn users that quotes are not needed
as Spack does not use a shell. Defaults to False.
input: Where to read stdin from input: Where to read stdin from
output: Where to send stdout output: Where to send stdout
error: Where to send stderr error: Where to send stderr
@ -140,6 +142,7 @@ def __call__(self, *args, **kwargs):
fail_on_error = kwargs.pop('fail_on_error', True) fail_on_error = kwargs.pop('fail_on_error', True)
ignore_errors = kwargs.pop('ignore_errors', ()) ignore_errors = kwargs.pop('ignore_errors', ())
ignore_quotes = kwargs.pop('ignore_quotes', False)
# If they just want to ignore one error code, make it a tuple. # If they just want to ignore one error code, make it a tuple.
if isinstance(ignore_errors, int): if isinstance(ignore_errors, int):
@ -164,15 +167,18 @@ def streamify(arg, mode):
estream, close_estream = streamify(error, 'w') estream, close_estream = streamify(error, 'w')
istream, close_istream = streamify(input, 'r') istream, close_istream = streamify(input, 'r')
quoted_args = [arg for arg in args if re.search(r'^"|^\'|"$|\'$', arg)] if not ignore_quotes:
if quoted_args: quoted_args = [arg for arg in args if re.search(r'^"|^\'|"$|\'$', arg)]
tty.warn( if quoted_args:
"Quotes in command arguments can confuse scripts like" tty.warn(
" configure.", "Quotes in command arguments can confuse scripts like"
"The following arguments may cause problems when executed:", " configure.",
str("\n".join([" " + arg for arg in quoted_args])), "The following arguments may cause problems when executed:",
"Quotes aren't needed because spack doesn't use a shell.", str("\n".join([" " + arg for arg in quoted_args])),
"Consider removing them") "Quotes aren't needed because spack doesn't use a shell. "
"Consider removing them.",
"If multiple levels of quotation are required, use "
"`ignore_quotes=True`.")
cmd = self.exe + list(args) cmd = self.exe + list(args)