From 24b742025c0da3097d6a495652a4ece9450f6267 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 9 Sep 2010 15:02:56 +0000
Subject: [PATCH] Fix git-try, was broken by r58936.

TBR=bradnelson
TEST=git-try works
BUG=54084

Review URL: http://codereview.chromium.org/3311021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@58941 0039d316-1c4b-4281-b951-d872f2087c98
---
 git-try | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/git-try b/git-try
index 9eaec61ba..e61831a5d 100755
--- a/git-try
+++ b/git-try
@@ -9,25 +9,32 @@ import sys
 
 import breakpad
 
+import gclient_utils
 from scm import GIT
 import trychange
 
 
 def GetRietveldIssueNumber():
-  return GIT.Capture(
-      ['config', 'branch.%s.rietveldissue' % GIT.GetBranch(None)],
-      error_ok=True)[0]
+  try:
+    return GIT.Capture(
+        ['config', 'branch.%s.rietveldissue' % GIT.GetBranch(None)])
+  except gclient_utils.Error:
+    return None
 
 
 def GetRietveldPatchsetNumber():
-  return GIT.Capture(
-      ['config', 'branch.%s.rietveldpatchset' % GIT.GetBranch(None)],
-      error_ok=True)[0]
+  try:
+    return GIT.Capture(
+        ['config', 'branch.%s.rietveldpatchset' % GIT.GetBranch(None)])
+  except gclient_utils.Error:
+    return None
 
 
 def GetRietveldServerUrl():
-  return GIT.Capture(
-      ['config', 'rietveld.server'], error_ok=True)[0].strip()
+  try:
+    return GIT.Capture(['config', 'rietveld.server']).strip()
+  except gclient_utils.Error:
+    return None
 
 
 if __name__ == '__main__':