summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-03-02 16:22:00 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:46 +0000
commit0788007ccf66e290a7893248aa507e48366ebdfa (patch)
tree5076cf3915ebd74d9573d888c125effb44e545d0 /bitbake/lib/bb
parent0a66fc224284c76ee067a5f24745629e299e8cf4 (diff)
downloadpoky-0788007ccf66e290a7893248aa507e48366ebdfa.tar.gz
bitbake: fetch2: remove last remaining usage of deprecated bb.data APIs
(Bitbake rev: 62dc3c3b40a95f9df31f5c917574c3822fb8bb64) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py3
-rw-r--r--bitbake/lib/bb/fetch2/npm.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 5209f4d3dc..327da87e72 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -38,7 +38,6 @@ import pickle
38import errno 38import errno
39import bb.persist_data, bb.utils 39import bb.persist_data, bb.utils
40import bb.checksum 40import bb.checksum
41from bb import data
42import bb.process 41import bb.process
43 42
44__version__ = "2" 43__version__ = "2"
@@ -1183,7 +1182,7 @@ class FetchData(object):
1183 self.mirrortarball = None 1182 self.mirrortarball = None
1184 self.basename = None 1183 self.basename = None
1185 self.basepath = None 1184 self.basepath = None
1186 (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d)) 1185 (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(d.expand(url))
1187 self.date = self.getSRCDate(d) 1186 self.date = self.getSRCDate(d)
1188 self.url = url 1187 self.url = url
1189 if not self.user and "user" in self.parm: 1188 if not self.user and "user" in self.parm:
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
index 780f26d37f..73a75fe989 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -25,7 +25,6 @@ import json
25import subprocess 25import subprocess
26import signal 26import signal
27import bb 27import bb
28from bb import data
29from bb.fetch2 import FetchMethod 28from bb.fetch2 import FetchMethod
30from bb.fetch2 import FetchError 29from bb.fetch2 import FetchError
31from bb.fetch2 import ChecksumError 30from bb.fetch2 import ChecksumError