Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1054)

Unified Diff: client/tools/buildbot_annotated_steps.py

Issue 9160013: Missed file in previous checkin. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698