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

trychange.py

Index: trychange.py
diff --git a/trychange.py b/trychange.py
index 003f040b2688a039cb396890da6d061a07933113..1cfe583e5a5eab09ec180c3c594dda48e50ecc1a 100755
--- a/trychange.py
+++ b/trychange.py
@@ -37,6 +37,8 @@ import gcl
 import fix_encoding
 import gclient_utils
 import scm
+import subprocess2
+
 
 __version__ = '1.2'
 
@@ -758,7 +760,7 @@ def TryChange(argv,
       return 1
     print >> sys.stderr, e
     return 1
-  except gclient_utils.Error, e:
+  except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0