Issue 2007: backtick() doesn't use ENV

1 files changed, 15 insertions, 11 deletions

diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index db69d62..67881eb 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -526,17 +526,21 @@ class SubstitutionEnvironment:
 
     def backtick(self, command):
         import subprocess
-        if SCons.Util.is_List(command): 
-            p = subprocess.Popen(command,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
-                                 universal_newlines=True)
-        else:
-            p = subprocess.Popen(command,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
-                                 universal_newlines=True,
-                                 shell=True)
+        # common arguments
+        kw = { 'stdout' : subprocess.PIPE,
+               'stderr' : subprocess.PIPE,
+               'universal_newlines' : True,
+             }
+        # if the command is a list, assume it's been quoted
+        # othewise force a shell
+        if not SCons.Util.is_List(command): kw['shell'] = True
+        # a SubstutionEnvironment has no ENV, so only add it
+        # to the args if it exists
+        e = self._dict.get('ENV')
+        if e: kw['env'] = e
+        # run constructed command
+        #FUTURE p = subprocess.Popen(command, **kw)
+        p = apply(subprocess.Popen, (command,), kw)
         out = p.stdout.read()
         p.stdout.close()
         err = p.stderr.read()