summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 20:54:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 20:57:30 +0000
commit408a0d8b25a67efb9caaf12b29b0cd48e132a3c2 (patch)
treeb965edd43936568e47d396137bf013f318eef435 /bitbake
parent73b9f64357f03da95c5d4b4d0d56ff1bb1e3ff0d (diff)
downloadpoky-408a0d8b25a67efb9caaf12b29b0cd48e132a3c2.tar.gz
bitbake: fetch2/local: Fix bug introduced by expression ambiguity
The last changes introduced an error in some of the logic. Add brackets to clarify the meaning of the expression and fix certain build failures. (Bitbake rev: 87aea65bd5d553bd0495b0f1efe6d41d0bb2810f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/local.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py
index 45de15f48a..58bbe20327 100644
--- a/bitbake/lib/bb/fetch2/local.py
+++ b/bitbake/lib/bb/fetch2/local.py
@@ -63,7 +63,7 @@ class Local(FetchMethod):
63 if filesdir: 63 if filesdir:
64 logger.debug(2, "Searching for %s in path: %s" % (path, filesdir)) 64 logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
65 newpath = os.path.join(filesdir, path) 65 newpath = os.path.join(filesdir, path)
66 if not newpath or not os.path.exists(newpath) and path.find("*") != -1: 66 if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1:
67 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists 67 # For expressions using '*', best we can do is take the first directory in FILESPATH that exists
68 newpath = bb.utils.which(filespath, ".") 68 newpath = bb.utils.which(filespath, ".")
69 logger.debug(2, "Searching for %s in path: %s" % (path, newpath)) 69 logger.debug(2, "Searching for %s in path: %s" % (path, newpath))