Merge "Check for a cookie file when fetching clone.bundle."

This commit is contained in:
Conley Owens 2013-01-17 20:02:03 +00:00 committed by Gerrit Code Review
commit 84f7e137c2

View File

@ -1746,6 +1746,9 @@ class Project(object):
os.remove(tmpPath) os.remove(tmpPath)
if 'http_proxy' in os.environ and 'darwin' == sys.platform: if 'http_proxy' in os.environ and 'darwin' == sys.platform:
cmd += ['--proxy', os.environ['http_proxy']] cmd += ['--proxy', os.environ['http_proxy']]
cookiefile = GitConfig.ForUser().GetString('http.cookiefile')
if cookiefile:
cmd += ['--cookie', cookiefile]
cmd += [srcUrl] cmd += [srcUrl]
if IsTrace(): if IsTrace():