summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/fetch2/cvs.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py
index a111467bfc..6a948c4aec 100644
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/bitbake/lib/bb/fetch2/cvs.py
@@ -111,15 +111,9 @@ class Cvs(FetchMethod):
111 if ud.tag: 111 if ud.tag:
112 options.append("-r %s" % ud.tag) 112 options.append("-r %s" % ud.tag)
113 113
114 localdata = data.createCopy(d) 114 cvsbasecmd = d.getVar("FETCHCMD_cvs", True)
115 data.setVar('OVERRIDES', "cvs:%s" % data.getVar('OVERRIDES', localdata), localdata) 115 cvscmd = cvsbasecmd + "'-d" + cvsroot + "' co " + " ".join(options) + " " + ud.module
116 data.update_data(localdata) 116 cvsupdatecmd = cvsbasecmd + "'-d" + cvsroot + "' update -d -P " + " ".join(options)
117
118 data.setVar('CVSROOT', cvsroot, localdata)
119 data.setVar('CVSCOOPTS', " ".join(options), localdata)
120 data.setVar('CVSMODULE', ud.module, localdata)
121 cvscmd = data.getVar('FETCHCOMMAND', localdata, True)
122 cvsupdatecmd = data.getVar('UPDATECOMMAND', localdata, True)
123 117
124 if cvs_rsh: 118 if cvs_rsh:
125 cvscmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvscmd) 119 cvscmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvscmd)