From e3db8556563f57c5566e4dd744c871c77de0c444 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Mon, 18 Apr 2011 18:46:19 +0000 Subject: [PATCH] Fix drover regression introduced in r80453. getSVNInfo() is expected to fail in some use case. Make this behavior explicit. R=dpranke@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/6881008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@81970 0039d316-1c4b-4281-b951-d872f2087c98 --- drover.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drover.py b/drover.py index 17aa49a38..6ffef8594 100755 --- a/drover.py +++ b/drover.py @@ -64,14 +64,16 @@ def gclUpload(revision, author): return runGcl(command) def getSVNInfo(url, revision): - svn_info = subprocess2.check_output( - ['svn', 'info', '%s@%s' % (url, revision)]).splitlines() info = {} - for line in svn_info: - match = re.search(r"(.*?):(.*)", line) - if match: - info[match.group(1).strip()]=match.group(2).strip() - + try: + svn_info = subprocess2.check_output( + ['svn', 'info', '%s@%s' % (url, revision)]).splitlines() + for line in svn_info: + match = re.search(r"(.*?):(.*)", line) + if match: + info[match.group(1).strip()] = match.group(2).strip() + except subprocess2.CalledProcessError: + pass return info def isSVNDirty():