diff options
author | Brad Linden <brad@lindenlab.com> | 2023-10-25 13:22:13 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2023-10-25 16:12:13 -0700 |
commit | 673b3309dde153fdadf7559bd16a5bb6db4723a1 (patch) | |
tree | 726d5e38b016d1d5504c3024b0959cec00d6c9c1 /indra/lib | |
parent | 887226c7d2462306191126cc5bfc0de96e18ad42 (diff) | |
parent | e4d6a08941f9c4e81bda8ae14d481be5029353fd (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/lib')
-rwxr-xr-x | indra/lib/python/indra/util/llmanifest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 820f356dae..bcb9d884c3 100755 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -38,6 +38,7 @@ import itertools import operator import os import re +import shlex import shutil import subprocess import sys @@ -531,15 +532,15 @@ class LLManifest(object, metaclass=LLManifestRegistry): self.cmakedirs(path) return path - def run_command(self, command): + def run_command(self, command, **kwds): """ Runs an external command. Raises ManifestError exception if the command returns a nonzero status. """ - print("Running command:", command) + print("Running command:", shlex.join(command)) sys.stdout.flush() try: - subprocess.check_call(command) + subprocess.check_call(command, **kwds) except subprocess.CalledProcessError as err: raise ManifestError( "Command %s returned non-zero status (%s)" % (command, err.returncode) ) |