Change CheckCall behavior when print_error=False

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 10 matching lines @@
 import stat
 import subprocess
 import sys
 import time
 import xml.dom.minidom
 import xml.parsers.expat
 
 
 class CheckCallError(OSError):
   """CheckCall() returned non-0."""
-  def __init__(self, command, cwd, retcode, stdout):
-    OSError.__init__(self, command, cwd, retcode, stdout)
+  def __init__(self, command, cwd, retcode, stdout, stderr=None):
+    OSError.__init__(self, command, cwd, retcode, stdout, stderr)
     self.command = command
     self.cwd = cwd
     self.retcode = retcode
     self.stdout = stdout
+    self.stderr = stderr
 
 
 def CheckCall(command, cwd=None, print_error=True):
   """Like subprocess.check_call() but returns stdout.
 
   Works on python 2.4
   """
   logging.debug("%s, cwd=%s" % (str(command), str(cwd)))
   try:
     stderr = None
     if not print_error:
       stderr = subprocess.PIPE
     process = subprocess.Popen(command, cwd=cwd,
                                shell=sys.platform.startswith('win'),
                                stdout=subprocess.PIPE,
                                stderr=stderr)
-    output = process.communicate()[0]
+    std_out,std_err = process.communicate()

[M-A Ruel, 2010/01/30 03:09:21]

std_out, std_err

[Nasser Grainawi, 2010/01/30 04:49:26]

Done.

   except OSError, e:
     raise CheckCallError(command, cwd, e.errno, None)
   if process.returncode:
-    raise CheckCallError(command, cwd, process.returncode, output)
-  return output
+    raise CheckCallError(command, cwd, process.returncode, std_out, std_err)
+  return std_out,std_err

[M-A Ruel, 2010/01/30 03:09:21]

idem

[Nasser Grainawi, 2010/01/30 04:49:26]

Done.

 
 
 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:
     components = url.split("@")
@@ skipping 246 matching lines @@
   """Returns the difference subpath minus root."""
   root = os.path.realpath(root)
   subpath = os.path.realpath(subpath)
   if not subpath.startswith(root):
     return None
   # If the root does not have a trailing \ or /, we add it so the returned
   # path starts immediately after the seperator regardless of whether it is
   # provided.
   root = os.path.join(root, '')
   return subpath[len(root):]