summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 19:03:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-26 10:49:13 +0100
commit5c09cbe3bf456e968fc853827698eb18b62e8348 (patch)
tree34250e2aeaa73bf72b78957cfcb6c4c240d380be
parentf10a3457cdfbb4a94978da998d178d4254632fa7 (diff)
downloadopenembedded-core-5c09cbe3bf456e968fc853827698eb18b62e8348.tar.gz
openembedded-core-5c09cbe3bf456e968fc853827698eb18b62e8348.tar.bz2
openembedded-core-5c09cbe3bf456e968fc853827698eb18b62e8348.tar.xz
openembedded-core-5c09cbe3bf456e968fc853827698eb18b62e8348.zip
lib/oe/utils: 'Fix' oe.utils.contains() behaviour
Currently oe.utils.contains(X, "A", true, false) will return true for substring matches, e.g. if X = "ABC". This is not what most users expect from the function. In the common OE use of this function there is the case of "touchscreen" and "screen" being used as independent variables. Whilst it could be argued there isn't a problem in that specific case (touchscreens are usually on screens), there is no substring usage of this function is OE-Core so this patch changes the behaviour to match only full strings. It also fixes a bug where duplicate entries would confuse multiple matches, e.g. contains(X, ["A", "B"], ...) would match X = "A A" which is clearly wrong. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/utils.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index f6d4142c1..5a63ed3c3 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -35,16 +35,15 @@ def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
return falsevalue
def contains(variable, checkvalues, truevalue, falsevalue, d):
- val = bb.data.getVar(variable,d,1)
+ val = d.getVar(variable, True)
if not val:
return falsevalue
- matches = 0
- if type(checkvalues).__name__ == "str":
- checkvalues = [checkvalues]
- for value in checkvalues:
- if val.find(value) != -1:
- matches = matches + 1
- if matches == len(checkvalues):
+ val = set(val.split())
+ if isinstance(checkvalues, basestring):
+ checkvalues = set(checkvalues.split())
+ else:
+ checkvalues = set(checkvalues)
+ if checkvalues.issubset(val):
return truevalue
return falsevalue