scm.py - Issue 10805037: Fix the svn version check issue, append '--quiet' to get svn version string.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scm.py

Issue 10805037: Fix the svn version check issue, append '--quiet' to get svn version string. (Closed) Base URL: https://git.chromium.org/chromium/tools/depot_tools.git@master

Patch Set: Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: scm.py

diff --git a/scm.py b/scm.py

index 35d11a4c4a3530e099abfd57f0a4977953747af1..aade53e477d78e60d2bcd7ef1d2232e61c348f75 100644

--- a/scm.py

+++ b/scm.py

@@ -1004,7 +1004,7 @@ class SVN(object):

def AssertVersion(cls, min_version):

"""Asserts svn's version is at least min_version."""

if cls.current_version is None:

- cls.current_version = cls.Capture(['--version'], None).split()[2]

+ cls.current_version = cls.Capture(['--version', '--quiet'], None)

current_version_list = map(only_int, cls.current_version.split('.'))

for min_ver in map(int, min_version.split('.')):

ver = current_version_list.pop(0)

« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »