diff options
| -rw-r--r-- | bitbake/lib/bb/utils.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 075ca88ab5..4eac2852ed 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
| @@ -861,12 +861,11 @@ def contains(variable, checkvalues, truevalue, falsevalue, d): | |||
| 861 | val = d.getVar(variable, True) | 861 | val = d.getVar(variable, True) |
| 862 | if not val: | 862 | if not val: |
| 863 | return falsevalue | 863 | return falsevalue |
| 864 | matches = 0 | 864 | val = set(val.split()) |
| 865 | if type(checkvalues).__name__ == "str": | 865 | if isinstance(checkvalues, basestring): |
| 866 | checkvalues = [checkvalues] | 866 | checkvalues = set(checkvalues.split()) |
| 867 | for value in checkvalues: | 867 | else: |
| 868 | if val.find(value) != -1: | 868 | checkvalues = set(checkvalues) |
| 869 | matches = matches + 1 | 869 | if checkvalues.issubset(val): |
| 870 | if matches == len(checkvalues): | ||
| 871 | return truevalue | 870 | return truevalue |
| 872 | return falsevalue | 871 | return falsevalue |