From 972eb5fababb33b5537fcfbbaf8e33ea820f0fee Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 3 Feb 2011 21:17:26 +0000 Subject: bitbake/fetch2: Move ud.localfile setup into urldata_init Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/perforce.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch2/perforce.py') diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index bda0bb809..aefc20784 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py @@ -98,9 +98,8 @@ class Perforce(Fetch): return cset.split(' ')[1] getcset = staticmethod(getcset) - def localpath(self, url, ud, d): - - (host, path, user, pswd, parm) = Perforce.doparse(url, d) + def urldata_init(self, ud, d): + (host, path, user, pswd, parm) = Perforce.doparse(ud.url, d) # If a label is specified, we use that as our filename @@ -119,6 +118,7 @@ class Perforce(Fetch): ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), cset), d) + def localpath(self, url, ud, d): return os.path.join(data.getVar("DL_DIR", d, 1), ud.localfile) def download(self, loc, ud, d): -- cgit v1.2.3