From 93499ebc46547f5bf6dcecd5a786ead9f726de28 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:19 -0300 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/lib/oe/utils.py | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'meta/lib/oe/utils.py') 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): else: return falsevalue -def contains(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.issubset(val): - return truevalue - return falsevalue - def both_contain(variable1, variable2, checkvalue, d): if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1: return checkvalue -- cgit 1.2.3-korg