summaryrefslogtreecommitdiffstats
path: root/bitbake/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-22 12:03:02 +0000
commit9d7f8e2a206f8266fd0766b6161dbd1bf6b787a7 (patch)
tree2002648fd17558c7d895d672aa65fa46f4b82250 /bitbake/lib/bb/fetch2/osc.py
parent4acc7322a2ada941b803e1aee23d84351888eef0 (diff)
downloadpoky-9d7f8e2a206f8266fd0766b6161dbd1bf6b787a7.tar.gz
bitbake: 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. (Bitbake rev: 6a48474de9505a3700863f31839a7c53c5e18a8d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/osc.py')
-rw-r--r--bitbake/lib/bb/fetch2/osc.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index 1a3a7bb56b..3d8779682f 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -20,7 +20,7 @@ class Osc(FetchMethod):
20 """Class to fetch a module or modules from Opensuse build server 20 """Class to fetch a module or modules from Opensuse build server
21 repositories.""" 21 repositories."""
22 22
23 def supports(self, url, ud, d): 23 def supports(self, ud, d):
24 """ 24 """
25 Check to see if a given url can be fetched with osc. 25 Check to see if a given url can be fetched with osc.
26 """ 26 """
@@ -77,7 +77,7 @@ class Osc(FetchMethod):
77 77
78 return osccmd 78 return osccmd
79 79
80 def download(self, loc, ud, d): 80 def download(self, ud, d):
81 """ 81 """
82 Fetch url 82 Fetch url
83 """ 83 """
@@ -86,7 +86,7 @@ class Osc(FetchMethod):
86 86
87 if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK): 87 if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK):
88 oscupdatecmd = self._buildosccommand(ud, d, "update") 88 oscupdatecmd = self._buildosccommand(ud, d, "update")
89 logger.info("Update "+ loc) 89 logger.info("Update "+ ud.url)
90 # update sources there 90 # update sources there
91 os.chdir(ud.moddir) 91 os.chdir(ud.moddir)
92 logger.debug(1, "Running %s", oscupdatecmd) 92 logger.debug(1, "Running %s", oscupdatecmd)
@@ -94,7 +94,7 @@ class Osc(FetchMethod):
94 runfetchcmd(oscupdatecmd, d) 94 runfetchcmd(oscupdatecmd, d)
95 else: 95 else:
96 oscfetchcmd = self._buildosccommand(ud, d, "fetch") 96 oscfetchcmd = self._buildosccommand(ud, d, "fetch")
97 logger.info("Fetch " + loc) 97 logger.info("Fetch " + ud.url)
98 # check out sources there 98 # check out sources there
99 bb.utils.mkdirhier(ud.pkgdir) 99 bb.utils.mkdirhier(ud.pkgdir)
100 os.chdir(ud.pkgdir) 100 os.chdir(ud.pkgdir)