summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/wget.py23
1 files changed, 11 insertions, 12 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 208ee9bdd6..8ee9769d39 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -90,13 +90,13 @@ class Wget(FetchMethod):
90 90
91 self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate" 91 self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate"
92 92
93 def _runwget(self, ud, d, command, quiet): 93 def _runwget(self, ud, d, command, quiet, workdir=None):
94 94
95 progresshandler = WgetProgressHandler(d) 95 progresshandler = WgetProgressHandler(d)
96 96
97 logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command)) 97 logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command))
98 bb.fetch2.check_network_access(d, command, ud.url) 98 bb.fetch2.check_network_access(d, command, ud.url)
99 runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler) 99 runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler, workdir=workdir)
100 100
101 def download(self, ud, d): 101 def download(self, ud, d):
102 """Fetch urls""" 102 """Fetch urls"""
@@ -422,17 +422,16 @@ class Wget(FetchMethod):
422 Run fetch checkstatus to get directory information 422 Run fetch checkstatus to get directory information
423 """ 423 """
424 f = tempfile.NamedTemporaryFile() 424 f = tempfile.NamedTemporaryFile()
425 with tempfile.TemporaryDirectory(prefix="wget-index-") as workdir, tempfile.NamedTemporaryFile(dir=workdir, prefix="wget-listing-") as f:
426 agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12"
427 fetchcmd = self.basecmd
428 fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'"
429 try:
430 self._runwget(ud, d, fetchcmd, True, workdir=workdir)
431 fetchresult = f.read()
432 except bb.fetch2.BBFetchException:
433 fetchresult = ""
425 434
426 agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12"
427 fetchcmd = self.basecmd
428 fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'"
429 try:
430 self._runwget(ud, d, fetchcmd, True)
431 fetchresult = f.read()
432 except bb.fetch2.BBFetchException:
433 fetchresult = ""
434
435 f.close()
436 return fetchresult 435 return fetchresult
437 436
438 def _check_latest_version(self, url, package, package_regex, current_version, ud, d): 437 def _check_latest_version(self, url, package, package_regex, current_version, ud, d):