summaryrefslogtreecommitdiff
path: root/indra/lib/python
diff options
context:
space:
mode:
authorThomas Nelson <rider@lindenlab.com>2018-01-23 08:55:58 -0800
committerThomas Nelson <rider@lindenlab.com>2018-01-23 08:55:58 -0800
commit6489598d57571d5b984cb37eec4dd4421ce86c2a (patch)
tree87584ba45f81e0f6877f8eaafce53e821bf924a8 /indra/lib/python
parent1b8c2b5ebbe0d42f147730bc9b6528fa8c6796ce (diff)
parentd97d7c52068b71bd99b10db046c6a0688b61a254 (diff)
Merged lindenlab/viewer64 into default
Diffstat (limited to 'indra/lib/python')
-rwxr-xr-xindra/lib/python/indra/util/llmanifest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 7050ce43b7..598261e3d7 100755
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -529,7 +529,7 @@ class LLManifest(object):
print "Running command:", command
sys.stdout.flush()
try:
- subprocess.check_call(command, shell=True)
+ subprocess.check_call(command)
except subprocess.CalledProcessError as err:
raise ManifestError( "Command %s returned non-zero status (%s)"
% (command, err.returncode) )
@@ -545,6 +545,7 @@ class LLManifest(object):
def put_in_file(self, contents, dst, src=None):
# write contents as dst
dst_path = self.dst_path_of(dst)
+ self.cmakedirs(os.path.dirname(dst_path))
f = open(dst_path, "wb")
try:
f.write(contents)