[bitbake-devel,2/2] bb.utils, bb.codeparser: Add bb.utils.contains_any
Submitted by Otavio Salvador on April 25, 2014, 9:21 p.m.
|
Patch ID: 70993
Details
Commit Message
@@ -103,7 +103,8 @@ class BufferedLogger(Logger):
class PythonParser():
getvars = ("d.getVar", "bb.data.getVar", "data.getVar", "d.appendVar", "d.prependVar")
- containsfuncs = ("bb.utils.contains", "base_contains")
+ containsfuncs = ("bb.utils.contains", "base_contains",
+ "bb.utils.contains_any", "base_contains_any")
execfuncs = ("bb.build.exec_func", "bb.build.exec_task")
def warn(self, func, arg):
@@ -845,6 +845,19 @@ def contains(variable, checkvalues, truevalue, falsevalue, d):
return truevalue
return falsevalue
+def contains_any(variable, checkvalues, truevalue, falsevalue, d):
+ val = d.getVar(variable, True)
+ if not val:
+ return falsevalue
+ val = set(val.split())
+ if isinstance(checkvalues, basestring):
+ checkvalues = set(checkvalues.split())
+ else:
+ checkvalues = set(checkvalues)
+ if checkvalues in val:
+ return truevalue
+ return falsevalue
+
def cpu_count():
return multiprocessing.cpu_count()
This includes contains_any in the special handling code for sstate. It does not take into account the equivalence of the values. In current code, considering 'bb.utils.contains_any("A", "foo bar", ...)': A = "foo" A = "bar" A = "foo bar" All those will get different signatures. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- lib/bb/codeparser.py | 3 ++- lib/bb/utils.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)