Fix webkit build failure reported by evan@

When fetching svn URL via 'git svn info --url' command
git-svn.perl script may print its progress log to stdout instead of stderr: as a result we end up using all this junk as svn repository URL.
Fix it by filtering output.

BUG=None
TEST=None

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@76803 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
dilmah@chromium.org 2011-03-03 20:52:17 +00:00
Родитель 0019e6cb0b
Коммит d9640c6030
1 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -129,14 +129,15 @@ def FetchGitSVNURL(directory):
Returns:
SVN URL.
"""
if not IsGitSVN(directory):
return None
proc = RunGitCommand(directory, ['svn', 'info', '--url'])
if proc:
output = proc.communicate()[0].strip()
if proc.returncode == 0:
return output
return None
if IsGitSVN(directory):
proc = RunGitCommand(directory, ['svn', 'info', '--url'])
if proc:
output = proc.communicate()[0].strip()
if proc.returncode == 0:
match = re.search(r'^\w+://.*$', output, re.M)
if match:
return match.group(0)
return ''
def LookupGitSVNRevision(directory, depth):