From 0112bfb5168d77039fccfe593acd2bb38a64526f Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 8 Sep 2011 20:54:04 +0000 Subject: [PATCH] GIT.Capture doesn't throw gclient_utils.Error anymore. Fix case where git-try fails for branch not still uploaded to rietveld. TBR=dpranke@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/7860004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100244 0039d316-1c4b-4281-b951-d872f2087c98 --- git_try.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git_try.py b/git_try.py index f3f2332c9a..06aaa6eb5f 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