From 254488f0890c88df5915f9bdb694772a5ec4b5cb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 9 Jul 2012 16:43:27 +0000 Subject: bitbake: 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. (Bitbake rev: 390ad59739356422852e976fa246375abc6aba08) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/cvs.py | 12 +++--------- 1 file 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): 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) -- cgit v1.2.3-54-g00ecf