fix: failure of make engine test when a make engine alias contains a modifier. There can be more than one variant per alias via "." e.g. make.extrastuff where make and extrastuff are variants. fix
authortimothy.murphy@nokia.com
Fri, 12 Feb 2010 14:57:02 +0200
branchfix
changeset 204 a19456c07783
parent 203 faed4203d5c6
child 205 ce7b587b436c
fix: failure of make engine test when a make engine alias contains a modifier. There can be more than one variant per alias via "." e.g. make.extrastuff where make and extrastuff are variants.
sbsv2/raptor/python/raptor_data.py
--- a/sbsv2/raptor/python/raptor_data.py	Thu Feb 11 10:01:02 2010 +0000
+++ b/sbsv2/raptor/python/raptor_data.py	Fri Feb 12 14:57:02 2010 +0200
@@ -975,10 +975,10 @@
 
 	def isDerivedFrom(self, progenitor, cache):
 		self.Resolve(cache)
-		if len(self.variants) == 1:
-			return self.variants[0].isDerivedFrom(progenitor,cache)
-		else:
-			return False
+		for v in self.variants:
+			if v.isDerivedFrom(progenitor,cache):
+				return True
+		return False
 
 class AliasRef(Reference):