summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-04 18:27:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-07 11:03:00 +0100
commitd4d4aab8dc6f1a75c3a3331e8df71297b3dddcc1 (patch)
tree941427f3bbcb8d0ee6b0dfe786221da423d2b6f5
parentc77bcfbfe36a7c780ed244c63daec4255f9d4343 (diff)
downloadpoky-d4d4aab8dc6f1a75c3a3331e8df71297b3dddcc1.tar.gz
bitbake/fetch2/wget: Add fallback/default wget commands
(Bitbake rev: 9586808572d06de4127f6a524e87e9ad75232423) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/wget.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 9d361150e4..98900ac42c 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -54,12 +54,12 @@ class Wget(FetchMethod):
54 """Fetch urls""" 54 """Fetch urls"""
55 55
56 if checkonly: 56 if checkonly:
57 fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True) 57 fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True) or d.expand("/usr/bin/env wget --spider -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'")
58 elif os.path.exists(ud.localpath): 58 elif os.path.exists(ud.localpath):
59 # file exists, but we didnt complete it.. trying again.. 59 # file exists, but we didnt complete it.. trying again..
60 fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True) 60 fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True) or d.expand("/usr/bin/env wget -c -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'")
61 else: 61 else:
62 fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True) 62 fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True) or d.expand("/usr/bin/env wget -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'")
63 63
64 uri = uri.split(";")[0] 64 uri = uri.split(";")[0]
65 uri_decoded = list(decodeurl(uri)) 65 uri_decoded = list(decodeurl(uri))
@@ -78,7 +78,7 @@ class Wget(FetchMethod):
78 # Also, this used to happen if sourceforge sent us to the mirror page 78 # Also, this used to happen if sourceforge sent us to the mirror page
79 if not os.path.exists(ud.localpath) and not checkonly: 79 if not os.path.exists(ud.localpath) and not checkonly:
80 raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri) 80 raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri)
81 81
82 return True 82 return True
83 83
84 def checkstatus(self, uri, ud, d): 84 def checkstatus(self, uri, ud, d):