From bcd9c57a96c04c27883746feb0e75211f8de6d32 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 10 Apr 2010 22:05:02 -0700 Subject: Switch some references to moved functions (Bitbake rev: ddea2978cb969cf1381cfee5c055de0c9e56a4e3) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch/local.py | 3 ++- bitbake/lib/bb/fetch/wget.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch') diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py index a2abc8639..882a2c460 100644 --- a/bitbake/lib/bb/fetch/local.py +++ b/bitbake/lib/bb/fetch/local.py @@ -27,6 +27,7 @@ BitBake build tools. import os import bb +import bb.utils from bb import data from bb.fetch import Fetch @@ -47,7 +48,7 @@ class Local(Fetch): if path[0] != "/": filespath = data.getVar('FILESPATH', d, 1) if filespath: - newpath = bb.which(filespath, path) + newpath = bb.utils.which(filespath, path) if not newpath: filesdir = data.getVar('FILESDIR', d, 1) if filesdir: diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py index ae1c6ad13..8b687372a 100644 --- a/bitbake/lib/bb/fetch/wget.py +++ b/bitbake/lib/bb/fetch/wget.py @@ -30,6 +30,7 @@ import bb from bb import data from bb.fetch import Fetch from bb.fetch import FetchError +from bb.fetch import encodeurl, decodeurl class Wget(Fetch): """Class to fetch urls via 'wget'""" @@ -41,7 +42,7 @@ class Wget(Fetch): def localpath(self, url, ud, d): - url = bb.encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}]) + url = encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}]) ud.basename = os.path.basename(ud.path) ud.localfile = data.expand(os.path.basename(url), d) @@ -60,7 +61,7 @@ class Wget(Fetch): fetchcmd = data.getVar("FETCHCOMMAND", d, 1) uri = uri.split(";")[0] - uri_decoded = list(bb.decodeurl(uri)) + uri_decoded = list(decodeurl(uri)) uri_type = uri_decoded[0] uri_host = uri_decoded[1] -- cgit v1.2.3