Revert r80216 "Reapply r79779: "Removed gclient_utils.Popen() and use subprocess2's ...""

gclient_utils.py

 # Copyright (c) 2010 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.
 
 """Generic utils."""
 
 import errno
 import logging
 import os
 import Queue
 import re
 import stat
 import subprocess
 import sys
 import threading
 import time
 import xml.dom.minidom
 import xml.parsers.expat
 
-import subprocess2
 
-# Keep an alias for now.
-Popen = subprocess2.Popen
+def hack_subprocess():
+  """subprocess functions may throw exceptions when used in multiple threads.
+
+  See http://bugs.python.org/issue1731717 for more information.
+  """
+  subprocess._cleanup = lambda: None
 
 
 class Error(Exception):
   """gclient exception class."""
   pass
 
 
 class CheckCallError(OSError, Error):
   """CheckCall() returned non-0."""
   def __init__(self, command, cwd, returncode, stdout, stderr=None):
@@ skipping 11 matching lines @@
       out += ' in ' + self.cwd
     if self.returncode is not None:
       out += ' returned %d' % self.returncode
     if self.stdout is not None:
       out += '\nstdout: %s\n' % self.stdout
     if self.stderr is not None:
       out += '\nstderr: %s\n' % self.stderr
     return out
 
 
+def Popen(args, **kwargs):
+  """Calls subprocess.Popen() with hacks to work around certain behaviors.
+
+  Ensure English outpout for svn and make it work reliably on Windows.
+  """
+  logging.debug(u'%s, cwd=%s' % (u' '.join(args), kwargs.get('cwd', '')))
+  if not 'env' in kwargs:
+    # It's easier to parse the stdout if it is always in English.
+    kwargs['env'] = os.environ.copy()
+    kwargs['env']['LANGUAGE'] = 'en'
+  if not 'shell' in kwargs:
+    # *Sigh*:  Windows needs shell=True, or else it won't search %PATH% for the
+    # executable, but shell=True makes subprocess on Linux fail when it's called
+    # with a list because it only tries to execute the first item in the list.
+    kwargs['shell'] = (sys.platform=='win32')
+  try:
+    return subprocess.Popen(args, **kwargs)
+  except OSError, e:
+    if e.errno == errno.EAGAIN and sys.platform == 'cygwin':
+      raise Error(
+          'Visit '
+          'http://code.google.com/p/chromium/wiki/CygwinDllRemappingFailure to '
+          'learn how to fix this error; you need to rebase your cygwin dlls')
+    raise
+
+
 def CheckCall(command, print_error=True, **kwargs):
   """Similar subprocess.check_call() but redirects stdout and
   returns (stdout, stderr).
 
   Works on python 2.4
   """
   try:
     stderr = None
     if not print_error:
       stderr = subprocess.PIPE
@@ skipping 465 matching lines @@
 
   In gclient's case, Dependencies sometime needs to be run out of order due to
   From() keyword. This class manages that all the required dependencies are run
   before running each one.
 
   Methods of this class are thread safe.
   """
   def __init__(self, jobs, progress):
     """jobs specifies the number of concurrent tasks to allow. progress is a
     Progress instance."""
+    hack_subprocess()
     # Set when a thread is done or a new item is enqueued.
     self.ready_cond = threading.Condition()
     # Maximum number of concurrent tasks.
     self.jobs = jobs
     # List of WorkItem, for gclient, these are Dependency instances.
     self.queued = []
     # List of strings representing each Dependency.name that was run.
     self.ran = []
     # List of items currently running.
     self.running = []
@@ skipping 123 matching lines @@
         logging.info('Caught exception in thread %s' % self.item.name)
         logging.info(str(sys.exc_info()))
         work_queue.exceptions.put(sys.exc_info())
       logging.info('Task %s done' % self.item.name)
 
       work_queue.ready_cond.acquire()
       try:
         work_queue.ready_cond.notifyAll()
       finally:
         work_queue.ready_cond.release()