summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-25 18:21:24 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-29 23:38:54 +0100
commit17daa2ba6280304771c5fe52b94eb56f0c087490 (patch)
tree30f893dadcb549c1a3d2ee130055d9cb691bb0d5 /bitbake/lib
parentf98159f9d34618a7f09f735a22848c7871a068eb (diff)
downloadpoky-17daa2ba6280304771c5fe52b94eb56f0c087490.tar.gz
bitbake: bb.utils, bb.codeparser: Add bb.utils.contains_any
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. (Bitbake rev: d1e3345d715e488ec3f5515fb0e1fb39366346bc) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/codeparser.py2
-rw-r--r--bitbake/lib/bb/utils.py13
2 files changed, 14 insertions, 1 deletions
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py
index de8d2eb08d..8439efbb2e 100644
--- a/bitbake/lib/bb/codeparser.py
+++ b/bitbake/lib/bb/codeparser.py
@@ -103,7 +103,7 @@ class BufferedLogger(Logger):
103 103
104class PythonParser(): 104class PythonParser():
105 getvars = ("d.getVar", "bb.data.getVar", "data.getVar", "d.appendVar", "d.prependVar") 105 getvars = ("d.getVar", "bb.data.getVar", "data.getVar", "d.appendVar", "d.prependVar")
106 containsfuncs = ("bb.utils.contains", "base_contains", "oe.utils.contains") 106 containsfuncs = ("bb.utils.contains", "base_contains", "oe.utils.contains", "bb.utils.contains_any")
107 execfuncs = ("bb.build.exec_func", "bb.build.exec_task") 107 execfuncs = ("bb.build.exec_func", "bb.build.exec_task")
108 108
109 def warn(self, func, arg): 109 def warn(self, func, arg):
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 0be45e1af6..1be1874cbc 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -845,6 +845,19 @@ def contains(variable, checkvalues, truevalue, falsevalue, d):
845 return truevalue 845 return truevalue
846 return falsevalue 846 return falsevalue
847 847
848def contains_any(variable, checkvalues, truevalue, falsevalue, d):
849 val = d.getVar(variable, True)
850 if not val:
851 return falsevalue
852 val = set(val.split())
853 if isinstance(checkvalues, basestring):
854 checkvalues = set(checkvalues.split())
855 else:
856 checkvalues = set(checkvalues)
857 if checkvalues in val:
858 return truevalue
859 return falsevalue
860
848def cpu_count(): 861def cpu_count():
849 return multiprocessing.cpu_count() 862 return multiprocessing.cpu_count()
850 863