Improve exception handling.

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 25 matching lines @@
   """CheckCall() returned non-0."""
   def __init__(self, command, cwd, returncode, stdout, stderr=None):
     OSError.__init__(self, command, cwd, returncode, stdout, stderr)
     Error.__init__(self)
     self.command = command
     self.cwd = cwd
     self.returncode = returncode
     self.stdout = stdout
     self.stderr = stderr
 
+  def __str__(self):
+    out = ' '.join(self.command)
+    if self.cwd:
+      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()
@@ skipping 267 matching lines @@
           if (time.time() - last_flushed_at) > 10:
             last_flushed_at = time.time()
             stdout.flush()
       in_byte = kid.stdout.read(1)
     # Flush the rest of buffered output. This is only an issue with
     # stdout/stderr not ending with a \n.
     if len(in_line):
       filter_fn(in_line)
   rv = kid.wait()
   if rv:
-    raise Error('failed to run command: %s' % ' '.join(args))
+    raise CheckCallError(args, kwargs.get('cwd', None), rv, None)
   return 0
 
 
 def FindGclientRoot(from_dir, filename='.gclient'):
   """Tries to find the gclient root."""
   path = os.path.realpath(from_dir)
   while not os.path.exists(os.path.join(path, filename)):
     split_path = os.path.split(path)
     if not split_path[1]:
       return None
@@ skipping 181 matching lines @@
         if exception:
           self.parent.exceptions.append(exception)
         if self.parent.progress:
           self.parent.progress.update(1)
         assert not self.item.name in self.parent.ran
         if not self.item.name in self.parent.ran:
           self.parent.ran.append(self.item.name)
       finally:
         self.parent.ready_cond.notifyAll()
         self.parent.ready_cond.release()