diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-19 14:32:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-21 17:20:16 +0000 |
commit | 6a48474de9505a3700863f31839a7c53c5e18a8d (patch) | |
tree | 118f3ff841a9ebd9e93bf24bc9571ced36067a5e /lib/bb/fetch2/cvs.py | |
parent | 06590cfebbcf6565a17b80cc298e3ecdfaba4656 (diff) | |
download | bitbake-6a48474de9505a3700863f31839a7c53c5e18a8d.tar.gz |
fetch2: Stop passing around the pointless url parameter
There is no good reason to keep passing around the url parameter when
its contained within urldata (ud). This is left around due to
legacy reasons, some functions take it, some don't and its time
to cleanup.
This is fetcher internal API, there are a tiny number of external users
of the internal API (buildhistory and distrodata) which can be fixed up
after this change.
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bb/fetch2/cvs.py b/lib/bb/fetch2/cvs.py index 0a672a33e..d27d96f68 100644 --- a/lib/bb/fetch2/cvs.py +++ b/lib/bb/fetch2/cvs.py @@ -36,7 +36,7 @@ class Cvs(FetchMethod): """ Class to fetch a module or modules from cvs repositories """ - def supports(self, url, ud, d): + def supports(self, ud, d): """ Check to see if a given url can be fetched with cvs. """ @@ -65,14 +65,14 @@ class Cvs(FetchMethod): ud.localfile = bb.data.expand('%s_%s_%s_%s%s%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.tag, ud.date, norecurse, fullpath), d) - def need_update(self, url, ud, d): + def need_update(self, ud, d): if (ud.date == "now"): return True if not os.path.exists(ud.localpath): return True return False - def download(self, loc, ud, d): + def download(self, ud, d): method = ud.parm.get('method', 'pserver') localdir = ud.parm.get('localdir', ud.module) @@ -124,13 +124,13 @@ class Cvs(FetchMethod): pkgdir = os.path.join(d.getVar('CVSDIR', True), pkg) moddir = os.path.join(pkgdir, localdir) if os.access(os.path.join(moddir, 'CVS'), os.R_OK): - logger.info("Update " + loc) + logger.info("Update " + ud.url) bb.fetch2.check_network_access(d, cvsupdatecmd, ud.url) # update sources there os.chdir(moddir) cmd = cvsupdatecmd else: - logger.info("Fetch " + loc) + logger.info("Fetch " + ud.url) # check out sources there bb.utils.mkdirhier(pkgdir) os.chdir(pkgdir) |