From 4d7f50382e0a749b6fc75edc9fdb7744f43b7e87 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 24 Nov 2011 13:56:52 +0000 Subject: 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 --- bitbake/lib/bb/fetch2/local.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py index 2bf92c96a5..a0ed4442fb 100644 --- a/bitbake/lib/bb/fetch2/local.py +++ b/bitbake/lib/bb/fetch2/local.py @@ -50,9 +50,6 @@ class Local(FetchMethod): path = url.split("://")[1] path = path.split(";")[0] 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] != "/": filespath = data.getVar('FILESPATH', d, True) if filespath: @@ -62,6 +59,7 @@ class Local(FetchMethod): if filesdir: newpath = os.path.join(filesdir, path) 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 newpath -- cgit v1.2.3-54-g00ecf