# HG changeset patch
# User timkelly
# Date 1270759635 18000
# Node ID 090abdc9b9eebde2c4734da9889bea738ffad226
# Parent  8c32afc8c881efaa8c63b2318253316283be243b# Parent  9d05552239c24f4e884ffbfe5aea8b3111404d42
merge commit

diff -r 8c32afc8c881 -r 090abdc9b9ee core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Thu Apr 08 14:51:58 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Thu Apr 08 15:47:15 2010 -0500
@@ -267,7 +267,10 @@
 					// Get the parent base build platform 
 					String baseBuildPlatform = null; 
 					if (parentNode != null){ 
-						baseBuildPlatform = parentNode.getAttributes().getNamedItem("name").getNodeValue(); 
+						baseBuildPlatform = parentNode.getAttributes().getNamedItem("name").getNodeValue();
+						if (baseBuildPlatform.split("_").length > 1){
+							baseBuildPlatform = baseBuildPlatform.split("_")[0];
+						}
 					}
 					// only support configs that fall into something we can make a build context
 					// out of.  They must have a platform and a target.