summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-13 19:29:45 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-13 19:29:45 -0400
commit6c6f6f402383baaa53cb14f31813654a6c6c0279 (patch)
tree598830a96501b2dbe2c0184a093c1c85f6c69ec3 /indra/lib/python
parent62898143bff7627eeea860cd6fdf7ae865d85a60 (diff)
SL-19242: Pass arbitrary subprocess kwds through run_command().
That is, make LLManifest.run_command() accept and forward subprocess keyword arguments.
Diffstat (limited to 'indra/lib/python')
-rwxr-xr-xindra/lib/python/indra/util/llmanifest.py7
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) )