| Index: git_try.py
|
| diff --git a/git_try.py b/git_try.py
|
| index f3f2332c9a222ddde67d4a86f312b0ca4188ae15..06aaa6eb5f2acefd3a4abb1d44737a0d95ef784a 100755
|
| --- a/git_try.py
|
| +++ b/git_try.py
|
| @@ -9,8 +9,8 @@ import sys
|
|
|
| import breakpad # pylint: disable=W0611
|
|
|
| -import gclient_utils
|
| from scm import GIT
|
| +import subprocess2
|
| import third_party.upload
|
| import trychange
|
|
|
| @@ -19,7 +19,7 @@ def GetRietveldIssueNumber():
|
| try:
|
| return GIT.Capture(
|
| ['config', 'branch.%s.rietveldissue' % GIT.GetBranch(None)])
|
| - except gclient_utils.Error:
|
| + except subprocess2.CalledProcessError:
|
| return None
|
|
|
|
|
| @@ -27,14 +27,14 @@ def GetRietveldPatchsetNumber():
|
| try:
|
| return GIT.Capture(
|
| ['config', 'branch.%s.rietveldpatchset' % GIT.GetBranch(None)])
|
| - except gclient_utils.Error:
|
| + except subprocess2.CalledProcessError:
|
| return None
|
|
|
|
|
| def GetRietveldServerUrl():
|
| try:
|
| return GIT.Capture(['config', 'rietveld.server']).strip()
|
| - except gclient_utils.Error:
|
| + except subprocess2.CalledProcessError:
|
| return None
|
|
|
|
|
|
|