diff options
author | Conley Owens <cco3@android.com> | 2013-01-17 20:02:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-17 20:02:03 +0000 |
commit | 84f7e137c20b7500a6a5c719c39e9166c6e40e85 (patch) | |
tree | ae4ebf317539cbd519ebe5ea3e055f0127510097 /project.py | |
parent | 26e2475a0fe090f5bd2c0a0a040f21cc71aac095 (diff) | |
parent | ed68d0e8529f059a5d989ebd505bfb53e869ec2f (diff) | |
download | git-repo-84f7e137c20b7500a6a5c719c39e9166c6e40e85.tar.gz |
Merge "Check for a cookie file when fetching clone.bundle."
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1746,6 +1746,9 @@ class Project(object): | |||
1746 | os.remove(tmpPath) | 1746 | os.remove(tmpPath) |
1747 | if 'http_proxy' in os.environ and 'darwin' == sys.platform: | 1747 | if 'http_proxy' in os.environ and 'darwin' == sys.platform: |
1748 | cmd += ['--proxy', os.environ['http_proxy']] | 1748 | cmd += ['--proxy', os.environ['http_proxy']] |
1749 | cookiefile = GitConfig.ForUser().GetString('http.cookiefile') | ||
1750 | if cookiefile: | ||
1751 | cmd += ['--cookie', cookiefile] | ||
1749 | cmd += [srcUrl] | 1752 | cmd += [srcUrl] |
1750 | 1753 | ||
1751 | if IsTrace(): | 1754 | if IsTrace(): |