summaryrefslogtreecommitdiffstats
path: root/lib/bb/fetch2/osc.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-19 14:32:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-21 17:20:16 +0000
commit6a48474de9505a3700863f31839a7c53c5e18a8d (patch)
tree118f3ff841a9ebd9e93bf24bc9571ced36067a5e /lib/bb/fetch2/osc.py
parent06590cfebbcf6565a17b80cc298e3ecdfaba4656 (diff)
downloadbitbake-contrib-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/osc.py')
-rw-r--r--lib/bb/fetch2/osc.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/fetch2/osc.py b/lib/bb/fetch2/osc.py
index 1a3a7bb56..3d8779682 100644
--- a/lib/bb/fetch2/osc.py
+++ b/lib/bb/fetch2/osc.py
@@ -20,7 +20,7 @@ class Osc(FetchMethod):
"""Class to fetch a module or modules from Opensuse build server
repositories."""
- def supports(self, url, ud, d):
+ def supports(self, ud, d):
"""
Check to see if a given url can be fetched with osc.
"""
@@ -77,7 +77,7 @@ class Osc(FetchMethod):
return osccmd
- def download(self, loc, ud, d):
+ def download(self, ud, d):
"""
Fetch url
"""
@@ -86,7 +86,7 @@ class Osc(FetchMethod):
if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK):
oscupdatecmd = self._buildosccommand(ud, d, "update")
- logger.info("Update "+ loc)
+ logger.info("Update "+ ud.url)
# update sources there
os.chdir(ud.moddir)
logger.debug(1, "Running %s", oscupdatecmd)
@@ -94,7 +94,7 @@ class Osc(FetchMethod):
runfetchcmd(oscupdatecmd, d)
else:
oscfetchcmd = self._buildosccommand(ud, d, "fetch")
- logger.info("Fetch " + loc)
+ logger.info("Fetch " + ud.url)
# check out sources there
bb.utils.mkdirhier(ud.pkgdir)
os.chdir(ud.pkgdir)