diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:19 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (patch) | |
tree | bfbf9bface6e748f3ab50d4a86046fc850b0c153 /meta/lib/oe/utils.py | |
parent | f11e9e295d7f8a1e0219fb7a45a5a134a773aae2 (diff) | |
download | poky-08a38a7865c41ec60f4b993b964f8d477ea0f680.tar.gz |
Globally replace oe.utils.contains to bb.utils.contains
BitBake has the exact same code as oe.utils.contains so there's no
reason to duplicate it. We now rely on the bb.utils.contains code for
metadata.
(From OE-Core rev: 93499ebc46547f5bf6dcecd5a786ead9f726de28)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r-- | meta/lib/oe/utils.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index defa53679b..0a1d1080c9 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -41,19 +41,6 @@ def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): | |||
41 | else: | 41 | else: |
42 | return falsevalue | 42 | return falsevalue |
43 | 43 | ||
44 | def contains(variable, checkvalues, truevalue, falsevalue, d): | ||
45 | val = d.getVar(variable, True) | ||
46 | if not val: | ||
47 | return falsevalue | ||
48 | val = set(val.split()) | ||
49 | if isinstance(checkvalues, basestring): | ||
50 | checkvalues = set(checkvalues.split()) | ||
51 | else: | ||
52 | checkvalues = set(checkvalues) | ||
53 | if checkvalues.issubset(val): | ||
54 | return truevalue | ||
55 | return falsevalue | ||
56 | |||
57 | def both_contain(variable1, variable2, checkvalue, d): | 44 | def both_contain(variable1, variable2, checkvalue, d): |
58 | if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1: | 45 | if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1: |
59 | return checkvalue | 46 | return checkvalue |