diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
commit | 4b7e6a49215b00d0cfa9a0fde3808f032a9599e5 (patch) | |
tree | f2e294728789ab01a7a89fa06b6c67c5464ceab0 /classes/base.bbclass | |
parent | 4601ad28765bf7ef207974f9ad7fc209d3745088 (diff) | |
parent | 8f19556367701b3a3fa50802903d0d67997407b7 (diff) |
merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
and '8091ca9b08503f4700e05ee8973cec755727ed4a'
Diffstat (limited to 'classes/base.bbclass')
-rw-r--r-- | classes/base.bbclass | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 249a25a218..504707e37b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -41,12 +41,17 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d): else: return falsevalue -def base_contains(variable, checkvalue, truevalue, falsevalue, d): - import bb - if bb.data.getVar(variable,d,1).find(checkvalue) != -1: - return truevalue - else: - return falsevalue +def base_contains(variable, checkvalues, truevalue, falsevalue, d): + import bb + matches = 0 + if type(checkvalues).__name__ == "str": + checkvalues = [checkvalues] + for value in checkvalues: + if bb.data.getVar(variable,d,1).find(value) != -1: + matches = matches + 1 + if matches == len(checkvalues): + return truevalue + return falsevalue def base_both_contain(variable1, variable2, checkvalue, d): import bb |