[oe-commits] org.oe.dev base.bbclass: Allow base_contains to take an array of values to check for (from poky)

[rpurdie commit]

base.bbclass: Allow base_contains to take an array of values to check for (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: b413f1877b7271efa31cab17e121514bcc98e52c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b413f1877b7271efa31cab17e121514bcc98e52c
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -rf62e2fac7e13e5139dde0dacbcbda49e2bee246b -rb413f1877b7271efa31cab17e121514bcc98e52c
#
# 
# 
# patch "classes/base.bbclass"
#  from [1de073097231fd1777de20167167563f452b6ef5]
#    to [5ddcfa4dc313d5d17a5d55de1d73a9392ef331f1]
# 
============================================================
--- classes/base.bbclass	1de073097231fd1777de20167167563f452b6ef5
+++ classes/base.bbclass	5ddcfa4dc313d5d17a5d55de1d73a9392ef331f1
@@ -41,12 +41,17 @@ def base_conditional(variable, checkvalu
 	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