Revert r79779: "Removed gclient_utils.Popen() and use subprocess2's version instead."
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@79781 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gclient_utils.py b/gclient_utils.py
index 733d43f..97c8227 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -17,10 +17,13 @@
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):
@@ -52,6 +55,32 @@
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).
@@ -537,6 +566,7 @@
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.