mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

fetch2/local: Don't default to files in DL_DIR for file:// urls

Browse Source 
Defaulting to any file in DL_DIR as the first match for a file:// url
doesn't make much sense and can lead to unexpected results.

This patch changes the logic so this is the last fallback location
instead. Whether it should be using DL_DIR at all for this is a
good question but something for another patch.

[YOCTO #1710]

(Bitbake rev: 5597a68fac0954c682b67471722c2643e2415f99)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-11-24 13:56:52 +00:00
parent 61c51bfce9
commit 8b0a893e75
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch2/local.py
+1 -3
View File
@@ -50,9 +50,6 @@ class Local(FetchMethod):
path = url.split("://")[1] path = url.split("://")[1]
path = path.split(";")[0] path = path.split(";")[0]
newpath = path newpath = path
dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path))
if os.path.exists(dldirfile):
return dldirfile
if path[0] != "/": if path[0] != "/":
filespath = data.getVar('FILESPATH', d, True) filespath = data.getVar('FILESPATH', d, True)
if filespath: if filespath:
@@ -62,6 +59,7 @@ class Local(FetchMethod):
if filesdir: if filesdir:
newpath = os.path.join(filesdir, path) newpath = os.path.join(filesdir, path)
if not os.path.exists(newpath) and path.find("*") == -1: if not os.path.exists(newpath) and path.find("*") == -1:
dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path))
return dldirfile return dldirfile
return newpath return newpath