Index: client/tools/buildbot_annotated_steps.py |
=================================================================== |
--- client/tools/buildbot_annotated_steps.py (revision 3522) |
+++ client/tools/buildbot_annotated_steps.py (working copy) |
@@ -63,14 +63,11 @@ |
if not name: |
name = socket.gethostname().split('.')[0] |
if not version: |
- has_shell = False |
- if platform == 'windows': |
- # In Windows we need to run in the shell, so that we have all the |
- # environment variables available. |
- has_shell = True |
+ # In Windows we need to run in the shell, so that we have all the |
+ # environment variables available. |
pipe = subprocess.Popen( |
['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, |
- shell=has_shell) |
+ shell=True) |
output = pipe.communicate() |
if pipe.returncode == 0: |
version = output[0] |
@@ -185,17 +182,14 @@ |
build and test experimental frog build |
''' |
print 'ProcessFrog' |
- has_shell = False |
if 'windows' in name: |
os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') + |
os.pathsep + os.environ['PATH']) |
- # In Windows we need to run in the shell, so that we have all the |
- # environment variables available. |
- has_shell = True |
- |
+ # In Windows we need to run in the shell, so that we have all the |
+ # environment variables available. |
return subprocess.call([sys.executable + ' ' + |
os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')], |
- env=os.environ, shell=has_shell) |
+ env=os.environ, shell=True) |
def main(): |
print 'main' |