fetch2/local: Improve handling of wildcard matches

PATCH New Richard Purdie 1 participant 1 message Nov 22, 2012

Share & tools

Richard Purdie

author

2012-11-22 21:54 UTC #0 lore raw

PATCH 1/1 fetch2/local: Improve handling of wildcard matches

Currently wildcard matches end up working by FILESDIR being defined in the metadata to a default of "." in FILESPATH which is hacky at best.

This patch adds the behaviour into the fetcher so its at least slightly more explicit.

Signed-off-by Richard Purdie <[email protected]>

---

bitbake/lib/bb/fetch2/local.py +6 -1

index 690532d..7ea2f3b 100644
@@ -62,7 +62,12 @@ class Local(FetchMethod):
                 if filesdir:
                     logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
                     newpath = os.path.join(filesdir, path)
-            if not os.path.exists(newpath) and path.find("*") == -1:
+            if not newpath or not os.path.exists(newpath) and path.find("*") != -1:
+                # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
+                newpath = bb.utils.which(filespath, ".")
+                logger.debug(2, "Searching for %s in path: %s" % (path, newpath))
+                return newpath
+            if not os.path.exists(newpath):
                 dldirfile = os.path.join(d.getVar("DL_DIR", True), path)
                 logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path))
                 bb.utils.mkdirhier(os.path.dirname(dldirfile))