From: Richard Purdie Date: Mon, 26 Nov 2012 20:54:30 +0000 (+0000) Subject: bitbake: fetch2/local: Fix bug introduced by expression ambiguity X-Git-Tag: rev_ivi_2015_02_04~14809 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2294685948da697ec7e9b8ba392dac0e6f51ec4;p=scm%2Fbb%2Ftizen-distro.git 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 --- diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py index 45de15f..58bbe20 100644 --- a/bitbake/lib/bb/fetch2/local.py +++ b/bitbake/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))