Attachment 102242 Details for Bug 233788 – patch to generator & frameworkadmin

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

[patch] patch to generator & frameworkadmin

233788.txt (text/plain), 2.35 KB, created by Andrew Niefer

on 2008-05-27 16:35:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2008-05-27 16:35:38 EDT

Size: 2.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.metadata.generator
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java,v
>retrieving revision 1.55
>diff -u -r1.55 Generator.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java	27 May 2008 17:31:35 -0000	1.55
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java	27 May 2008 20:30:23 -0000
>@@ -517,6 +517,10 @@
> 
> 			if (bundle.getSymbolicName().equals(ORG_ECLIPSE_EQUINOX_LAUNCHER)) {
> 				bundle = EclipseInstallGeneratorInfoProvider.createLauncher();
>+			} else if (bundle.getSymbolicName().startsWith(ORG_ECLIPSE_EQUINOX_LAUNCHER + '.')) {
>+				//launcher fragments will be handled by generateDefaultConfigIU(Set) for --launcher.library.
>+				//they don't need to be started so skip them here to avoid having to merge config commands
>+				continue;
> 			}
> 			if (bundle.getSymbolicName().equals(ORG_ECLIPSE_UPDATE_CONFIGURATOR)) {
> 				bundle.setStartLevel(BundleInfo.NO_LEVEL);
>#P org.eclipse.equinox.frameworkadmin.equinox
>Index: src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java,v
>retrieving revision 1.8
>diff -u -r1.8 EclipseLauncherParser.java
>--- src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java	25 Apr 2008 16:09:36 -0000	1.8
>+++ src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java	27 May 2008 20:30:24 -0000
>@@ -298,8 +298,9 @@
> 		} finally {
> 			if (bw != null)
> 				bw.close();
>-			if (launcherData.getPreviousLauncherIni() != null)
>-				launcherData.getPreviousLauncherIni().delete();
>+			File previousLauncherIni = launcherData.getPreviousLauncherIni();
>+			if (previousLauncherIni != null && !previousLauncherIni.equals(launcherConfigFile))
>+				previousLauncherIni.delete();
> 		}
> 	}
> }

Actions: View | Diff

Attachments on bug 233788: 102168 | 102242 | 102259 | 102279 | 102544 | 102567 | 102571