diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-24 13:56:52 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-24 22:01:42 +0000 |
| commit | 5597a68fac0954c682b67471722c2643e2415f99 (patch) | |
| tree | 00645302a14e2590b06b6ff00eb463aaff30f815 | |
| parent | 9a2029899c946ce9aa8adbc85f2cfe7a85b92182 (diff) | |
| download | bitbake-5597a68fac0954c682b67471722c2643e2415f99.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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/local.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py index 2bf92c96a..a0ed4442f 100644 --- a/lib/bb/fetch2/local.py +++ b/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 |