Missed file in previous checkin.

client/tools/buildbot_annotated_steps.py

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 #!/usr/bin/python
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ skipping 45 matching lines @@
     pattern = re.match(BUILDER_PATTERN, name)
     if pattern:
       platform = pattern.group(1)
       component = pattern.group(2)
       mode = pattern.group(3)
 
   # Fall back if not on builder.
   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]
     else:
       version = 'unknown'
   return (name, version, component, mode, platform)
 
 
 def RunDartcCompiler(mode, outdir):
   """Compiles the client code to javascript for dartc tests."""
@@ skipping 94 matching lines @@
     local_env['PATH'] = (os.path.join(javahome, 'bin') +
                          os.pathsep + local_env['PATH'])
 
   return subprocess.call(cmds, env=local_env)
 
 def ProcessFrog(name):
   '''
   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'
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.dirname(sys.argv[0])
   # Get at the top-level directory. This script is in client/tools
   os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir)))
 
   (name, version, component, mode, platform) = GetBuildInfo()
   if name.startswith('dart-editor'):
     status = ProcessTools(mode, name, version)
   #TODO(sigmund): remove this indirection once we update our bots
   elif name.startswith('frog'):
     status = ProcessFrog(name)
   else:
     status = ProcessDartClientTests(component, mode, platform, name)
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())