summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 13:56:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 22:11:44 +0000
commit8b0a893e75c9d54c2cd90e10f22e072bd5711422 (patch)
tree9999ed05b2fc3dc789ae70145def8c427e0e58d1 /bitbake/lib/bb
parent61c51bfce9ec68062adf8e525c30bf0e179a7f3c (diff)
downloadpoky-8b0a893e75c9d54c2cd90e10f22e072bd5711422.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/local.py4
1 files changed, 1 insertions, 3 deletions
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):
50 path = url.split("://")[1] 50 path = url.split("://")[1]
51 path = path.split(";")[0] 51 path = path.split(";")[0]
52 newpath = path 52 newpath = path
53 dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path))
54 if os.path.exists(dldirfile):
55 return dldirfile
56 if path[0] != "/": 53 if path[0] != "/":
57 filespath = data.getVar('FILESPATH', d, True) 54 filespath = data.getVar('FILESPATH', d, True)
58 if filespath: 55 if filespath:
@@ -62,6 +59,7 @@ class Local(FetchMethod):
62 if filesdir: 59 if filesdir:
63 newpath = os.path.join(filesdir, path) 60 newpath = os.path.join(filesdir, path)
64 if not os.path.exists(newpath) and path.find("*") == -1: 61 if not os.path.exists(newpath) and path.find("*") == -1:
62 dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path))
65 return dldirfile 63 return dldirfile
66 return newpath 64 return newpath
67 65