diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2017-03-02 16:22:00 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-03 11:26:06 +0000 |
commit | 62dc3c3b40a95f9df31f5c917574c3822fb8bb64 (patch) | |
tree | 7cd0545ce1e3876f5ddcfb72600d954f893a42fc /lib/bb/fetch2 | |
parent | 6fe07ed25457dd7952b60f4b2153d56b15d5eea6 (diff) | |
download | bitbake-contrib-62dc3c3b40a95f9df31f5c917574c3822fb8bb64.tar.gz |
fetch2: remove last remaining usage of deprecated bb.data APIs
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2')
-rw-r--r-- | lib/bb/fetch2/__init__.py | 3 | ||||
-rw-r--r-- | lib/bb/fetch2/npm.py | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 5209f4d3d..327da87e7 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -38,7 +38,6 @@ import pickle import errno import bb.persist_data, bb.utils import bb.checksum -from bb import data import bb.process __version__ = "2" @@ -1183,7 +1182,7 @@ class FetchData(object): self.mirrortarball = None self.basename = None self.basepath = None - (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d)) + (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(d.expand(url)) self.date = self.getSRCDate(d) self.url = url if not self.user and "user" in self.parm: diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py index 780f26d37..73a75fe98 100644 --- a/lib/bb/fetch2/npm.py +++ b/lib/bb/fetch2/npm.py @@ -25,7 +25,6 @@ import json import subprocess import signal import bb -from bb import data from bb.fetch2 import FetchMethod from bb.fetch2 import FetchError from bb.fetch2 import ChecksumError |