From ca35be31122f7ff712b2d955ec148f44e9b06156 Mon Sep 17 00:00:00 2001 From: "hinoka@google.com" Date: Fri, 17 Jan 2014 01:48:18 +0000 Subject: [PATCH] Gate tarball downloading based on SVN url BUG=334114 Review URL: https://codereview.chromium.org/136863007 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245414 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient_scm.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gclient_scm.py b/gclient_scm.py index d26487eab..bd709df23 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -1137,13 +1137,23 @@ class SVNWrapper(SCMWrapper): '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/', '/blink/trunk': 'gs://chromium-svn-checkout/blink/', } + WHITELISTED_ROOTS = [ + 'svn://svn.chromium.org', + 'svn://svn-mirror.golo.chromium.org', + ] if not exists: try: # Split out the revision number since it's not useful for us. base_path = urlparse.urlparse(url).path.split('@')[0] + # Check to see if we're on a whitelisted root. We do this because + # only some svn servers have matching UUIDs. + local_parsed = urlparse.urlparse(url) + local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc) if ('CHROME_HEADLESS' in os.environ and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac. - and base_path in BASE_URLS): + and base_path in BASE_URLS + and local_root in WHITELISTED_ROOTS): + # Use a tarball for initial sync if we are on a bot. # Get an unauthenticated gsutil instance. gsutil = download_from_google_storage.Gsutil( @@ -1181,8 +1191,6 @@ class SVNWrapper(SCMWrapper): tarball_parsed = urlparse.urlparse(tarball_url) tarball_root = '%s://%s' % (tarball_parsed.scheme, tarball_parsed.netloc) - local_parsed = urlparse.urlparse(url) - local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc) if tarball_root != local_root: print 'Switching repository root to %s' % local_root