Skip to contentSkip to conversation

fetch2/local: Don't default to files in DL_DIR for file:// urls

PATCH New Richard Purdie 1 participant 1 message Nov 24, 2011

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>
lib/bb/fetch2/local.py +1 -3
index 2bf92c9..a0ed444 100644
@@ -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