aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:43:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-10 14:22:16 +0100
commit390ad59739356422852e976fa246375abc6aba08 (patch)
tree9fcde93443032fd71b573a4c3b646cec3b219988
parent18aff925aece774d0172894e25584353519ca03f (diff)
downloadbitbake-390ad59739356422852e976fa246375abc6aba08.tar.gz
bitbake-390ad59739356422852e976fa246375abc6aba08.tar.bz2
bitbake-390ad59739356422852e976fa246375abc6aba08.zip
fetch2/cvs.py: Switch to use FETCHCMD_cvs and handle parameters in the fetcher itself
This brings the cvs fetcher more into line with the others and allows consistent usage of the FETCHCMD variable and option handling. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/cvs.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/bb/fetch2/cvs.py b/lib/bb/fetch2/cvs.py
index a111467b..6a948c4a 100644
--- a/lib/bb/fetch2/cvs.py
+++ b/lib/bb/fetch2/cvs.py
@@ -111,15 +111,9 @@ class Cvs(FetchMethod):
if ud.tag:
options.append("-r %s" % ud.tag)
- localdata = data.createCopy(d)
- data.setVar('OVERRIDES', "cvs:%s" % data.getVar('OVERRIDES', localdata), localdata)
- data.update_data(localdata)
-
- data.setVar('CVSROOT', cvsroot, localdata)
- data.setVar('CVSCOOPTS', " ".join(options), localdata)
- data.setVar('CVSMODULE', ud.module, localdata)
- cvscmd = data.getVar('FETCHCOMMAND', localdata, True)
- cvsupdatecmd = data.getVar('UPDATECOMMAND', localdata, True)
+ cvsbasecmd = d.getVar("FETCHCMD_cvs", True)
+ cvscmd = cvsbasecmd + "'-d" + cvsroot + "' co " + " ".join(options) + " " + ud.module
+ cvsupdatecmd = cvsbasecmd + "'-d" + cvsroot + "' update -d -P " + " ".join(options)
if cvs_rsh:
cvscmd = "CVS_RSH=\"%s\" %s" % (cvs_rsh, cvscmd)