diff options
| author | Greg Noel <GregNoel@tigris.org> | 2008-09-12 08:50:56 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2008-09-12 08:50:56 (GMT) |
| commit | 03e8064ca29643a22c0f37fda4e8ff6cbd7acf1d (patch) | |
| tree | a36cc8e0a326a631fc1928a2f782d83db07fe137 /src/engine/SCons/Environment.py | |
| parent | d23fa934f9057475f222c1241ffb22662ce005c2 (diff) | |
| download | SCons-03e8064ca29643a22c0f37fda4e8ff6cbd7acf1d.zip SCons-03e8064ca29643a22c0f37fda4e8ff6cbd7acf1d.tar.gz SCons-03e8064ca29643a22c0f37fda4e8ff6cbd7acf1d.tar.bz2 | |
Add common subproc function and modify routines to use it
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 1a4f5f5..f416bb0 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -534,13 +534,9 @@ class SubstitutionEnvironment: # 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) + #FUTURE p = Scons.Action._subproc(env, command, **kw) + p = apply(Scons.Action._subproc, (env, command), kw) out = p.stdout.read() p.stdout.close() err = p.stderr.read() |