diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-04-09 17:11:03 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
| commit | 6623d79adaf445081e68b307355292077800d4f4 (patch) | |
| tree | 219d0c9b31de4331703e1a81d3b7f233ac0169cf /bitbake/lib/bb/fetch | |
| parent | 1569c1ac851b56bc73bf8ccd5270cbdd9da68a2f (diff) | |
| download | openembedded-core-6623d79adaf445081e68b307355292077800d4f4.tar.gz openembedded-core-6623d79adaf445081e68b307355292077800d4f4.tar.bz2 openembedded-core-6623d79adaf445081e68b307355292077800d4f4.tar.xz openembedded-core-6623d79adaf445081e68b307355292077800d4f4.zip | |
Stop using functions via 'bb' that were moved from there to other modules
(Bitbake rev: 03a6c26f8da226f442c3cab557e4733f7cd6eeac)
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/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 15292c6b7..b1b5eda35 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -118,9 +118,9 @@ def uri_replace(uri, uri_find, uri_replace, d): # bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: operating on %s" % uri) if not uri or not uri_find or not uri_replace: bb.msg.debug(1, bb.msg.domain.Fetcher, "uri_replace: passed an undefined value, not replacing") - uri_decoded = list(bb.decodeurl(uri)) - uri_find_decoded = list(bb.decodeurl(uri_find)) - uri_replace_decoded = list(bb.decodeurl(uri_replace)) + uri_decoded = list(decodeurl(uri)) + uri_find_decoded = list(decodeurl(uri_find)) + uri_replace_decoded = list(decodeurl(uri_replace)) result_decoded = ['','','','','',{}] for i in uri_find_decoded: loc = uri_find_decoded.index(i) @@ -141,7 +141,7 @@ def uri_replace(uri, uri_find, uri_replace, d): # else: # for j in i: # FIXME: apply replacements against options - return bb.encodeurl(result_decoded) + return encodeurl(result_decoded) methods = [] urldata_cache = {} @@ -474,7 +474,7 @@ class FetchData(object): """ def __init__(self, url, d): self.localfile = "" - (self.type, self.host, self.path, self.user, self.pswd, self.parm) = bb.decodeurl(data.expand(url, d)) + (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d)) self.date = Fetch.getSRCDate(self, d) self.url = url if not self.user and "user" in self.parm: |