Attachment 146638 Details for Bug 288759 – patch code for this enhancement

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

[patch] patch code for this enhancement

patch_288759.txt (text/plain), 1.77 KB, created by Ben Xu

on 2009-09-08 03:50:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Xu

Created: 2009-09-08 03:50:31 EDT

Size: 1.77 KB

patch

obsolete

>Index: src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java,v
>retrieving revision 1.21
>diff -u -r1.21 DropinsRepositoryListener.java
>--- src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java	6 Apr 2009 16:57:35 -0000	1.21
>+++ src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java	8 Sep 2009 07:43:34 -0000
>@@ -37,6 +37,7 @@
> 	private static final String LINK = ".link"; //$NON-NLS-1$
> 	private static final String ZIP = ".zip"; //$NON-NLS-1$
> 	private static final String LINKS_PATH = "path"; //$NON-NLS-1$
>+	private static final String LINK_IS_OPTIONAL = "optional"; //$NON-NLS-1$
> 	private static final String DROPIN_ARTIFACT_REPOSITORIES = "dropin.artifactRepositories"; //$NON-NLS-1$
> 	private static final String DROPIN_METADATA_REPOSITORIES = "dropin.metadataRepositories"; //$NON-NLS-1$
> 	private static final String PIPE = "|"; //$NON-NLS-1$
>@@ -112,6 +113,15 @@
> 			path = path.trim();
> 		}
> 		File linkedFile = new File(path);
>+		// Check if the link target is marked as optional.
>+		// If link is optional, then the link target may not exist.
>+		// So IF link is marked as optional AND does not exist, simply ignore it.
>+		String optional = links.getProperty(LINK_IS_OPTIONAL);
>+		if (Boolean.valueOf(optional).booleanValue()) {
>+			if (!linkedFile.exists()) {
>+				return null;
>+			}
>+		}
> 		if (!linkedFile.isAbsolute()) {
> 			// link support is relative to the install root
> 			File root = Activator.getEclipseHome();

Actions: View | Diff

Attachments on bug 288759: 146638 | 177463