Attachment #102242 for bug #233788

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 233788
Collapse All | Expand All

Lines 517-522 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java (+4 lines)
517		517
518	if (bundle.getSymbolicName().equals(ORG_ECLIPSE_EQUINOX_LAUNCHER)) {	518	if (bundle.getSymbolicName().equals(ORG_ECLIPSE_EQUINOX_LAUNCHER)) {
519	bundle = EclipseInstallGeneratorInfoProvider.createLauncher();	519	bundle = EclipseInstallGeneratorInfoProvider.createLauncher();
		520	} else if (bundle.getSymbolicName().startsWith(ORG_ECLIPSE_EQUINOX_LAUNCHER + '.')) {
		521	//launcher fragments will be handled by generateDefaultConfigIU(Set) for --launcher.library.
		522	//they don't need to be started so skip them here to avoid having to merge config commands
		523	continue;
520	}	524	}
521	if (bundle.getSymbolicName().equals(ORG_ECLIPSE_UPDATE_CONFIGURATOR)) {	525	if (bundle.getSymbolicName().equals(ORG_ECLIPSE_UPDATE_CONFIGURATOR)) {
522	bundle.setStartLevel(BundleInfo.NO_LEVEL);	526	bundle.setStartLevel(BundleInfo.NO_LEVEL);

Lines 298-305 Link Here

(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java (-2 / +3 lines)
298	} finally {	298	} finally {
299	if (bw != null)	299	if (bw != null)
300	bw.close();	300	bw.close();
301	if (launcherData.getPreviousLauncherIni() != null)	301	File previousLauncherIni = launcherData.getPreviousLauncherIni();
302	launcherData.getPreviousLauncherIni().delete();	302	if (previousLauncherIni != null && !previousLauncherIni.equals(launcherConfigFile))
		303	previousLauncherIni.delete();
303	}	304	}
304	}	305	}
305	}	306	}

Return to bug 233788