From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 26 Nov 2012 20:54:30 +0000 (+0000)
Subject: fetch2/local: Fix bug introduced by expression ambiguity
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87aea65bd5d553bd0495b0f1efe6d41d0bb2810f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py
index 45de15f48aa..58bbe20327d 100644
--- a/lib/bb/fetch2/local.py
+++ b/lib/bb/fetch2/local.py
@@ -63,7 +63,7 @@ class Local(FetchMethod):
                 if filesdir:
                     logger.debug(2, "Searching for %s in path: %s" % (path, filesdir))
                     newpath = os.path.join(filesdir, path)
-            if not newpath or 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))