Support clone bundle through persistent-http[s].
Bug: https://crbug.com/gerrit/11075
Change-Id: I367c6bfe8da47d886c017a2ac614d4ccb3f8a438
diff --git a/project.py b/project.py
index ae2bf6f..8a38c58 100755
--- a/project.py
+++ b/project.py
@@ -2217,13 +2217,17 @@
cmd += ['--continue-at', '%d' % (size,)]
else:
platform_utils.remove(tmpPath)
- if 'http_proxy' in os.environ and 'darwin' == sys.platform:
- cmd += ['--proxy', os.environ['http_proxy']]
- with GetUrlCookieFile(srcUrl, quiet) as (cookiefile, _proxy):
+ with GetUrlCookieFile(srcUrl, quiet) as (cookiefile, proxy):
if cookiefile:
cmd += ['--cookie', cookiefile, '--cookie-jar', cookiefile]
- if srcUrl.startswith('persistent-'):
- srcUrl = srcUrl[len('persistent-'):]
+ if proxy:
+ cmd += ['--proxy', proxy]
+ elif 'http_proxy' in os.environ and 'darwin' == sys.platform:
+ cmd += ['--proxy', os.environ['http_proxy']]
+ if srcUrl.startswith('persistent-https'):
+ srcUrl = 'http' + srcUrl[len('persistent-https'):]
+ elif srcUrl.startswith('persistent-http'):
+ srcUrl = 'http' + srcUrl[len('persistent-http'):]
cmd += [srcUrl]
if IsTrace():
