Cleanup the code in gclient_utils to standardize on CheckCall nomenclature.

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 430 matching lines @@
     if command[0] == 'python':
       # If the hook specified "python" as the first item, the action is a
       # Python script.  Run it by starting a new copy of the same
       # 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
 
-    # 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.
-    return gclient_utils.SubprocessCall(command, cwd=self.root_dir(),
-        fail_status=2)
+    try:
+      gclient_utils.CheckCallAndFilterAndHeader(
+          command, cwd=self.root_dir(), always=True)
+    except gclient_utils.Error, 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):
     return self.parent.enforced_os()
 
   def recursion_limit(self):
     return self.parent.recursion_limit() - 1
 
@@ skipping 758 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: