summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:43:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-10 13:25:38 (GMT)
commit254488f0890c88df5915f9bdb694772a5ec4b5cb (patch)
treeacb3650670b90f328438f242bd6730dafc73dabc
parenta5e31cb7132136de8836305edf9f5731b2e8886b (diff)
downloadpoky-254488f0890c88df5915f9bdb694772a5ec4b5cb.tar.gz
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 <richard.purdie@linuxfoundation.org>
-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 a111467..6a948c4 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)