diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/npm.py | 1 |
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 | |||
38 | import errno | 38 | import errno |
39 | import bb.persist_data, bb.utils | 39 | import bb.persist_data, bb.utils |
40 | import bb.checksum | 40 | import bb.checksum |
41 | from bb import data | ||
42 | import bb.process | 41 | import 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 | |||
25 | import subprocess | 25 | import subprocess |
26 | import signal | 26 | import signal |
27 | import bb | 27 | import bb |
28 | from bb import data | ||
29 | from bb.fetch2 import FetchMethod | 28 | from bb.fetch2 import FetchMethod |
30 | from bb.fetch2 import FetchError | 29 | from bb.fetch2 import FetchError |
31 | from bb.fetch2 import ChecksumError | 30 | from bb.fetch2 import ChecksumError |