diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-09 16:43:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-10 14:22:16 +0100 |
| commit | 390ad59739356422852e976fa246375abc6aba08 (patch) | |
| tree | 9fcde93443032fd71b573a4c3b646cec3b219988 /lib/bb/fetch2/cvs.py | |
| parent | 18aff925aece774d0172894e25584353519ca03f (diff) | |
| download | bitbake-390ad59739356422852e976fa246375abc6aba08.tar.gz | |
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>
Diffstat (limited to 'lib/bb/fetch2/cvs.py')
| -rw-r--r-- | lib/bb/fetch2/cvs.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/bb/fetch2/cvs.py b/lib/bb/fetch2/cvs.py index a111467bf..6a948c4ae 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) |