# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1271276275 18000
# Node ID 889f3a3dcae6438187a995fad9be9976fdc9d466
# Parent  60fe1ef817c36144acaf165956ce96b03f58382f
Fix bug 11067 properly

diff -r 60fe1ef817c3 -r 889f3a3dcae6 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java	Tue Apr 13 10:17:53 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessSection.java	Wed Apr 14 15:17:55 2010 -0500
@@ -60,17 +60,29 @@
 			data.setExeSelectionPath(data.getDefaultExecutable());
 		if (Path.EMPTY.equals(data.getExeSelectionPath()))
 			data.setExeSelection(EExeSelection.ATTACH_TO_PROCESS);
+		
 		ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(data.getProject());
-		data.setInstallPackage((data.isSysTRKConnection() == Boolean.FALSE  /* but NOT if unknown */
-								|| !data.isInternalLayout())
-				&& !data.getExeSelection().equals(EExeSelection.ATTACH_TO_PROCESS));
+		boolean hasSisInstall = false;
 		if (cpi != null) {
 			ICarbideBuildConfiguration config = cpi.getDefaultConfiguration();
 			for (ISISBuilderInfo info : config.getSISBuilderInfoList()) {
 				IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath();
 				data.setSisPath(sisPath.toOSString());
+				if (info.isEnabled()) {
+					hasSisInstall = true;
+					break;
+				}
 			}
 		}
+		
+		if (data.getExeSelection().equals(EExeSelection.ATTACH_TO_PROCESS)) {
+			data.setInstallPackage(true);
+		} else {
+			Boolean detectedSysTrk = data.isSysTRKConnection(); // TRUE, FALSE, or null
+			boolean isSysTrk = detectedSysTrk == Boolean.TRUE || (detectedSysTrk == null && data.isInternalLayout());
+			data.setInstallPackage(hasSisInstall || !isSysTrk);
+		}
+		
 	}
 
 	@Override