From 08a38a7865c41ec60f4b993b964f8d477ea0f680 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. (From OE-Core rev: 93499ebc46547f5bf6dcecd5a786ead9f726de28) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 7 +++---- meta/lib/oe/utils.py | 13 ------------- 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index dddbef4d64..3d1111a40a 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -1,6 +1,5 @@ from abc import ABCMeta, abstractmethod from oe.utils import execute_pre_post_process -from oe.utils import contains as base_contains from oe.package_manager import * from oe.manifest import * import oe.path @@ -42,7 +41,7 @@ class Rootfs(object): pass def _insert_feed_uris(self): - if base_contains("IMAGE_FEATURES", "package-management", + if bb.utils.contains("IMAGE_FEATURES", "package-management", True, False, self.d): self.pm.insert_feeds_uris() @@ -108,7 +107,7 @@ class Rootfs(object): execute_pre_post_process(self.d, post_process_cmds) - if base_contains("IMAGE_FEATURES", "read-only-rootfs", + if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", True, False, self.d): delayed_postinsts = self._get_delayed_postinsts() if delayed_postinsts is not None: @@ -130,7 +129,7 @@ class Rootfs(object): self._cleanup() def _uninstall_uneeded(self): - if base_contains("IMAGE_FEATURES", "package-management", + if bb.utils.contains("IMAGE_FEATURES", "package-management", True, False, self.d): return 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 v1.2.3-54-g00ecf