summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-19 21:52:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-19 22:00:32 (GMT)
commit9a2a321bab79749eb4fdae28a0ec7d97ab85e4a3 (patch)
treef961f44f7ad9e506dd9574f75f261d1f5a3fc756
parent7ca6e975e2d2a9dcd6a1dffd6d472bce85cf498c (diff)
downloadpoky-9a2a321bab79749eb4fdae28a0ec7d97ab85e4a3.tar.gz
bitbake: wget: Improve mkdir handling
If there there isn't a subdirectory to the downloadfilename, this was failing. This patch avoids that issue. (Bitbake rev: 58bfd8d88495d4cae808e23b7af40e65ad05450f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/wget.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 36c19ca..131016c 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -64,8 +64,9 @@ class Wget(FetchMethod):
64 basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate" 64 basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate"
65 65
66 if not checkonly and 'downloadfilename' in ud.parm: 66 if not checkonly and 'downloadfilename' in ud.parm:
67 bb.utils.mkdirhier(os.path.dirname(ud.localfile)) 67 dldir = d.getVar("DL_DIR", True)
68 basecmd += " -O ${DL_DIR}/" + ud.localfile 68 bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile))
69 basecmd += " -O " + dldir + os.sep + ud.localfile
69 70
70 if checkonly: 71 if checkonly:
71 fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " --spider '${URI}'") 72 fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " --spider '${URI}'")