From f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 20 Dec 2006 00:00:03 +0000
Subject: Remove DISTRO_TYPE, replacing with IMAGE_FEATURES. Documentation is
 in local.conf.sample

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1053 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/classes/base.bbclass | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'meta/classes/base.bbclass')

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e7725b7443..e08a2be2d2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/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
-- 
cgit v1.2.3-54-g00ecf