diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-10 22:05:02 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:33 +0100 |
commit | bcd9c57a96c04c27883746feb0e75211f8de6d32 (patch) | |
tree | e393bbf7e0336f1098cc9228fd61aee2b3febd88 /bitbake/lib/bb/fetch | |
parent | c770c62fdcf35e76ed03361de901964bbe68433a (diff) | |
download | poky-bcd9c57a96c04c27883746feb0e75211f8de6d32.tar.gz |
Switch some references to moved functions
(Bitbake rev: ddea2978cb969cf1381cfee5c055de0c9e56a4e3)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r-- | bitbake/lib/bb/fetch/local.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch/wget.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py index a2abc8639c..882a2c4602 100644 --- a/bitbake/lib/bb/fetch/local.py +++ b/bitbake/lib/bb/fetch/local.py | |||
@@ -27,6 +27,7 @@ BitBake build tools. | |||
27 | 27 | ||
28 | import os | 28 | import os |
29 | import bb | 29 | import bb |
30 | import bb.utils | ||
30 | from bb import data | 31 | from bb import data |
31 | from bb.fetch import Fetch | 32 | from bb.fetch import Fetch |
32 | 33 | ||
@@ -47,7 +48,7 @@ class Local(Fetch): | |||
47 | if path[0] != "/": | 48 | if path[0] != "/": |
48 | filespath = data.getVar('FILESPATH', d, 1) | 49 | filespath = data.getVar('FILESPATH', d, 1) |
49 | if filespath: | 50 | if filespath: |
50 | newpath = bb.which(filespath, path) | 51 | newpath = bb.utils.which(filespath, path) |
51 | if not newpath: | 52 | if not newpath: |
52 | filesdir = data.getVar('FILESDIR', d, 1) | 53 | filesdir = data.getVar('FILESDIR', d, 1) |
53 | if filesdir: | 54 | if filesdir: |
diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py index ae1c6ad136..8b687372a4 100644 --- a/bitbake/lib/bb/fetch/wget.py +++ b/bitbake/lib/bb/fetch/wget.py | |||
@@ -30,6 +30,7 @@ import bb | |||
30 | from bb import data | 30 | from bb import data |
31 | from bb.fetch import Fetch | 31 | from bb.fetch import Fetch |
32 | from bb.fetch import FetchError | 32 | from bb.fetch import FetchError |
33 | from bb.fetch import encodeurl, decodeurl | ||
33 | 34 | ||
34 | class Wget(Fetch): | 35 | class Wget(Fetch): |
35 | """Class to fetch urls via 'wget'""" | 36 | """Class to fetch urls via 'wget'""" |
@@ -41,7 +42,7 @@ class Wget(Fetch): | |||
41 | 42 | ||
42 | def localpath(self, url, ud, d): | 43 | def localpath(self, url, ud, d): |
43 | 44 | ||
44 | url = bb.encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}]) | 45 | url = encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}]) |
45 | ud.basename = os.path.basename(ud.path) | 46 | ud.basename = os.path.basename(ud.path) |
46 | ud.localfile = data.expand(os.path.basename(url), d) | 47 | ud.localfile = data.expand(os.path.basename(url), d) |
47 | 48 | ||
@@ -60,7 +61,7 @@ class Wget(Fetch): | |||
60 | fetchcmd = data.getVar("FETCHCOMMAND", d, 1) | 61 | fetchcmd = data.getVar("FETCHCOMMAND", d, 1) |
61 | 62 | ||
62 | uri = uri.split(";")[0] | 63 | uri = uri.split(";")[0] |
63 | uri_decoded = list(bb.decodeurl(uri)) | 64 | uri_decoded = list(decodeurl(uri)) |
64 | uri_type = uri_decoded[0] | 65 | uri_type = uri_decoded[0] |
65 | uri_host = uri_decoded[1] | 66 | uri_host = uri_decoded[1] |
66 | 67 | ||