Fix a bug in gclient recurse for git-svn users. Make gclient_utils.CheckCall more versatile.

gclient_utils.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 66 matching lines @@
     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, cwd=None, print_error=True):
+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
-    process = Popen(command, cwd=cwd, stdout=subprocess.PIPE, stderr=stderr)
+    process = Popen(command, stdout=subprocess.PIPE, stderr=stderr, **kwargs)
     std_out, std_err = process.communicate()
   except OSError, e:
-    raise CheckCallError(command, cwd, e.errno, None)
+    raise CheckCallError(command, kwargs.get('cwd', None), e.errno, None)
   if process.returncode:
-    raise CheckCallError(command, cwd, process.returncode, std_out, std_err)
+    raise CheckCallError(command, kwargs.get('cwd', None), process.returncode,
+        std_out, std_err)
   return std_out, std_err
 
 
 def SplitUrlRevision(url):
   """Splits url and returns a two-tuple: url, rev"""
   if url.startswith('ssh:'):
     # Make sure ssh://test@example.com/test.git@stable works
     regex = r'(ssh://(?:[\w]+@)?[-\w:\.]+/[-\w\./]+)(?:@(.+))?'
     components = re.search(regex, url).groups()
   else:
@@ skipping 591 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()