fetch2/local: Don't default to files in DL_DIR for file:// urls
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:
parent
6803d97bdb
commit
4d7f50382e
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue