summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2/wget.py
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-02-27 15:14:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 11:16:07 +0000
commitb16192c93834d0a6530169557aa34122e1417bcf (patch)
tree194a2259542d50a1bafd8ea654a11ce0fd6d23d4 /bitbake/lib/bb/fetch2/wget.py
parentb1c48fb64619def3ee18286ccbb492e442e007dd (diff)
downloadpoky-b16192c93834d0a6530169557aa34122e1417bcf.tar.gz
bitbake: fetch2: don't use deprecated bb.data APIs
Cleanup some more usage of bb.data APIs in the fetchers. (Bitbake rev: 9752fd1c10b8fcc819822fa6eabc2c1050fcc03b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/wget.py')
-rw-r--r--bitbake/lib/bb/fetch2/wget.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 1cc445a426..0c61dfa20d 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -33,7 +33,6 @@ import logging
33import bb 33import bb
34import bb.progress 34import bb.progress
35import urllib.request, urllib.parse, urllib.error 35import urllib.request, urllib.parse, urllib.error
36from bb import data
37from bb.fetch2 import FetchMethod 36from bb.fetch2 import FetchMethod
38from bb.fetch2 import FetchError 37from bb.fetch2 import FetchError
39from bb.fetch2 import logger 38from bb.fetch2 import logger
@@ -84,9 +83,9 @@ class Wget(FetchMethod):
84 else: 83 else:
85 ud.basename = os.path.basename(ud.path) 84 ud.basename = os.path.basename(ud.path)
86 85
87 ud.localfile = data.expand(urllib.parse.unquote(ud.basename), d) 86 ud.localfile = d.expand(urllib.parse.unquote(ud.basename))
88 if not ud.localfile: 87 if not ud.localfile:
89 ud.localfile = data.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", "."), d) 88 ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", "."))
90 89
91 self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate" 90 self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate"
92 91