First pass to transition away for gclient_utils.Error and gclient_utils.CheckedCallError.

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 50 matching lines @@
 import sys
 import urlparse
 import urllib
 
 import breakpad  # pylint: disable=W0611
 
 import fix_encoding
 import gclient_scm
 import gclient_utils
 from third_party.repo.progress import Progress
+import subprocess2
 
 
 def attr(attribute, data):
   """Sets an attribute on a function."""
   def hook(fn):
     setattr(fn, attribute, data)
     return fn
   return hook
 
 
@@ skipping 365 matching lines @@
       # interpreter.
       command[0] = sys.executable
 
     if '$matching_files' in command:
       splice_index = command.index('$matching_files')
       command[splice_index:splice_index + 1] = matching_file_list
 
     try:
       gclient_utils.CheckCallAndFilterAndHeader(
           command, cwd=self.root_dir(), always=True)
-    except gclient_utils.Error, e:
+    except (gclient_utils.Error, subprocess2.CalledProcessError), e:
       # Use a discrete exit status code of 2 to indicate that a hook action
       # failed.  Users of this script may wish to treat hook action failures
       # differently from VC failures.
       print >> sys.stderr, 'Error: %s' % str(e)
       sys.exit(2)
 
   def root_dir(self):
     return self.parent.root_dir()
 
   def enforced_os(self):
@@ skipping 787 matching lines @@
     parser.format_epilog = lambda _: parser.epilog or ''
     if argv:
       command = Command(argv[0])
       if command:
         # 'fix' the usage and the description now that we know the subcommand.
         GenUsage(parser, argv[0])
         return command(parser, argv[1:])
     # Not a known command. Default to help.
     GenUsage(parser, 'help')
     return CMDhelp(parser, argv)
-  except gclient_utils.Error, e:
+  except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: