def merge(*flavors):
if isinstance(flavors[-1], int):
mergeType = flavors[-1]
flavors = flavors[:-1]
else:
mergeType = DEP_MERGE_TYPE_NORMAL
return str(mergeFlavorList([parseFlavor(x) for x in flavors],
mergeType))
def override2(flavor1, flavor2):
return str(mergeFlavorList([parseFlavor(flavor1), parseFlavor(flavor2)],
mergeType=DEP_MERGE_TYPE_DROP_CONFLICTS))
def override2(flavor1, flavor2):
return str(mergeFlavorList([parseFlavor(flavor1), parseFlavor(flavor2)],
mergeType=DEP_MERGE_TYPE_NORMAL))