[bitbake-devel] [PATCH 2/2] bb.utils, bb.codeparser: Add bb.utils.contains_any
Otavio Salvador
otavio at ossystems.com.br
Fri Apr 25 21:21:24 UTC 2014
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 at ossystems.com.br>
---
lib/bb/codeparser.py | 3 ++-
lib/bb/utils.py | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py
index b4b1013..58e0016 100644
--- a/lib/bb/codeparser.py
+++ b/lib/bb/codeparser.py
@@ -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):
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 0be45e1..1be1874 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -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()
--
2.0.0.rc0
More information about the bitbake-devel
mailing list