]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake/fetch2/wget: Add fallback/default wget commands
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 May 2012 17:27:31 +0000 (18:27 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 7 May 2012 10:03:00 +0000 (11:03 +0100)
(Bitbake rev: 9586808572d06de4127f6a524e87e9ad75232423)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/fetch2/wget.py

index 9d361150e4882db86481192157b9ce5dfc69ece4..98900ac42c0e0490b0533aad47f44cb00b31570d 100644 (file)
@@ -54,12 +54,12 @@ class Wget(FetchMethod):
         """Fetch urls"""
 
         if checkonly:
-            fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True)
+            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}'")
         elif os.path.exists(ud.localpath):
             # file exists, but we didnt complete it.. trying again..
-            fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True)
+            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}'")
         else:
-            fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True)
+            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}'")
 
         uri = uri.split(";")[0]
         uri_decoded = list(decodeurl(uri))
@@ -78,7 +78,7 @@ class Wget(FetchMethod):
         # Also, this used to happen if sourceforge sent us to the mirror page
         if not os.path.exists(ud.localpath) and not checkonly:
             raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri)
-       
+
         return True
 
     def checkstatus(self, uri, ud, d):