summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/fetch/cvs.py9
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 818f16a66..8745c0f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -123,6 +123,7 @@ Changes in Bitbake 1.9.x:
correctly.
- Handle exit codes correctly (from pH5)
- Work around refs/HEAD issues with git over http (#3410)
+ - Add proxy support to the CVS fetcher (from Cyril Chemparathy)
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/fetch/cvs.py b/lib/bb/fetch/cvs.py
index 70869d22a..01acc3f78 100644
--- a/lib/bb/fetch/cvs.py
+++ b/lib/bb/fetch/cvs.py
@@ -102,7 +102,14 @@ class Cvs(Fetch):
if method == "dir":
cvsroot = ud.path
else:
- cvsroot = ":" + method + ":" + ud.user
+ cvsroot = ":" + method
+ cvsproxyhost = data.getVar('CVS_PROXY_HOST', d, True)
+ if cvsproxyhost:
+ cvsroot += ";proxy=" + cvsproxyhost
+ cvsproxyport = data.getVar('CVS_PROXY_PORT', d, True)
+ if cvsproxyport:
+ cvsroot += ";proxyport=" + cvsproxyport
+ cvsroot += ":" + ud.user
if ud.pswd:
cvsroot += ":" + ud.pswd
cvsroot += "@" + ud.host + ":" + cvs_port + ud.path