From patchwork Mon Jul 9 16:52:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] fetch2/cvs.py: Switch to use FETCHCMD_cvs and handle parameters in the fetcher itself Date: Mon, 09 Jul 2012 16:52:40 -0000 From: Richard Purdie X-Patchwork-Id: 31543 Message-Id: <1341852760.8066.27.camel@ted> To: bitbake-devel 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 --- diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py index a111467..6a948c4 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)