Patchwork [bitbake-devel] wget: Drop usage of old style *COMMAND variables

login
register
mail settings
Submitter Richard Purdie
Date Feb. 28, 2014, 5:56 p.m.
Message ID <1393610164.31769.206.camel@ted>
Download mbox | patch
Permalink /patch/67757/
State New
Headers show

Comments

Richard Purdie - Feb. 28, 2014, 5:56 p.m.
These variables were dropped from OE-Core some time ago, drop their
usage from the fetcher as well.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 7cd25a5..e2f99ce 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -69,12 +69,12 @@  class Wget(FetchMethod):
             basecmd += " -O " + dldir + os.sep + ud.localfile
 
         if checkonly:
-            fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " --spider '${URI}'")
+            fetchcmd = d.expand(basecmd + " --spider '${URI}'")
         elif os.path.exists(ud.localpath):
             # file exists, but we didnt complete it.. trying again..
-            fetchcmd = d.getVar("RESUMECOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'")
+            fetchcmd = d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'")
         else:
-            fetchcmd = d.getVar("FETCHCOMMAND_wget", True) or d.expand(basecmd + " -P ${DL_DIR} '${URI}'")
+            fetchcmd = d.expand(basecmd + " -P ${DL_DIR} '${URI}'")
 
         uri = ud.url.split(";")[0]