[bitbake-devel] Richard Purdie : fetch2/local: Don't default to files in DL_DIR for file:// urls

[git at git.openembedded.org]

Module: bitbake.git
Branch: master
Commit: 5597a68fac0954c682b67471722c2643e2415f99
URL:    http://git.openembedded.org/?p=bitbake.git&a=commit;h=5597a68fac0954c682b67471722c2643e2415f99

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Nov 24 13:56:52 2011 +0000

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 at linuxfoundation.org>

---

 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 2bf92c9..a0ed444 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