diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-03 21:17:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-07 09:06:35 +0000 |
commit | 972eb5fababb33b5537fcfbbaf8e33ea820f0fee (patch) | |
tree | 2bd453bc66853c72cb284067d6679d6f498cd77b /bitbake/lib/bb/fetch2/perforce.py | |
parent | 0e5404cedadaea6738ef6468d7eb8a24d23d9bab (diff) | |
download | poky-972eb5fababb33b5537fcfbbaf8e33ea820f0fee.tar.gz |
bitbake/fetch2: Move ud.localfile setup into urldata_init
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/perforce.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/perforce.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index bda0bb8096..aefc207840 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py | |||
@@ -98,9 +98,8 @@ class Perforce(Fetch): | |||
98 | return cset.split(' ')[1] | 98 | return cset.split(' ')[1] |
99 | getcset = staticmethod(getcset) | 99 | getcset = staticmethod(getcset) |
100 | 100 | ||
101 | def localpath(self, url, ud, d): | 101 | def urldata_init(self, ud, d): |
102 | 102 | (host, path, user, pswd, parm) = Perforce.doparse(ud.url, d) | |
103 | (host, path, user, pswd, parm) = Perforce.doparse(url, d) | ||
104 | 103 | ||
105 | # If a label is specified, we use that as our filename | 104 | # If a label is specified, we use that as our filename |
106 | 105 | ||
@@ -119,6 +118,7 @@ class Perforce(Fetch): | |||
119 | 118 | ||
120 | ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), cset), d) | 119 | ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), cset), d) |
121 | 120 | ||
121 | def localpath(self, url, ud, d): | ||
122 | return os.path.join(data.getVar("DL_DIR", d, 1), ud.localfile) | 122 | return os.path.join(data.getVar("DL_DIR", d, 1), ud.localfile) |
123 | 123 | ||
124 | def download(self, loc, ud, d): | 124 | def download(self, loc, ud, d): |