# HG changeset patch # User timkelly # Date 1280183573 18000 # Node ID ff22cda9e5782a407bf8c47093ff8813d0ad5841 # Parent 7d2363cc40e5fc4adeb9f926589f6befe42b3f78 1) always try to rescan configs that have error messages. 2) remove some dead code diff -r 7d2363cc40e5 -r ff22cda9e578 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Mon Jul 26 16:31:09 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Mon Jul 26 17:32:53 2010 -0500 @@ -111,27 +111,6 @@ return sbsv2FilteredConetxts; } - private boolean isValidConfigForSDK(String alias) { - if (!alias.contains(".") && aliasToMeaningMap.get(alias) == null){ - return false; - } - - // test variant - String[] configTokens = alias.split("\\."); - if (aliasToMeaningMap.get(configTokens[0]) == null){ - return false; - } - - if (productList != null && productList.size() > 0) - for (String tok : configTokens){ - if (productList.contains(tok)){ - return true; - } - } - - return false; - } - private void initSBSv2BuildContextList(List allowedConfigs) throws SBSv2MinimumVersionException { List filteredAliasList = new ArrayList(); @@ -162,7 +141,7 @@ sbsv2FilteredConetxts.clear(); for (String alias : filteredAliasList) { SBSv2ConfigQueryData configQueryData = SBSv2QueryUtils.getConfigQueryDataForSDK(sdk, alias); - if (configQueryData != null) { + if (configQueryData != null && configQueryData.getConfigurationErrorMessage().trim().length() == 0) { ISBSv2BuildContext sbsv2Context = new BuildContextSBSv2(sdk, alias, configQueryData); sbsv2FilteredConetxts.add(sbsv2Context); processedAliasList.add(alias);