Commit 450e50d7 authored by mirandac@chromium.org's avatar mirandac@chromium.org

I am a huge fan of drover, but discovered this morning that it wasn't working...

I am a huge fan of drover, but discovered this morning that it wasn't working with my svn client, even though it was version 1.6.15.  I did some poking around, and found that because SlikSvn doesn't give a revision number in its --version information dump, it was failing to match the regex in drover.py.  I then noticed that the revision number wasn't being used for anything, so I removed it and everything worked great again.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@75398 0039d316-1c4b-4281-b951-d872f2087c98
parent e04657a2
...@@ -132,13 +132,12 @@ def getSVNVersionInfo(): ...@@ -132,13 +132,12 @@ def getSVNVersionInfo():
stderr=subprocess.PIPE).stdout.readlines() stderr=subprocess.PIPE).stdout.readlines()
info = {} info = {}
for line in svn_info: for line in svn_info:
match = re.search(r"svn, version ((\d+)\.(\d+)\.(\d+)) \(r(\d+)\)", line) match = re.search(r"svn, version ((\d+)\.(\d+)\.(\d+))", line)
if match: if match:
info['version'] = match.group(1) info['version'] = match.group(1)
info['major'] = int(match.group(2)) info['major'] = int(match.group(2))
info['minor'] = int(match.group(3)) info['minor'] = int(match.group(3))
info['patch'] = int(match.group(4)) info['patch'] = int(match.group(4))
info['revision'] = match.group(5)
return info return info
return None return None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment