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 288759 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/equinox/internal/p2/reconciler/dropins/DropinsRepositoryListener.java (+10 lines)
Lines 37-42 Link Here
37 
	private static final String LINK = ".link"; //$NON-NLS-1$
 37 
	private static final String LINK = ".link"; //$NON-NLS-1$
38 
	private static final String ZIP = ".zip"; //$NON-NLS-1$
 38 
	private static final String ZIP = ".zip"; //$NON-NLS-1$
39 
	private static final String LINKS_PATH = "path"; //$NON-NLS-1$
 39 
	private static final String LINKS_PATH = "path"; //$NON-NLS-1$
40 
	private static final String LINK_IS_OPTIONAL = "optional"; //$NON-NLS-1$
40 
	private static final String DROPIN_ARTIFACT_REPOSITORIES = "dropin.artifactRepositories"; //$NON-NLS-1$
 41 
	private static final String DROPIN_ARTIFACT_REPOSITORIES = "dropin.artifactRepositories"; //$NON-NLS-1$
41 
	private static final String DROPIN_METADATA_REPOSITORIES = "dropin.metadataRepositories"; //$NON-NLS-1$
 42 
	private static final String DROPIN_METADATA_REPOSITORIES = "dropin.metadataRepositories"; //$NON-NLS-1$
42 
	private static final String PIPE = "|"; //$NON-NLS-1$
 43 
	private static final String PIPE = "|"; //$NON-NLS-1$
Lines 112-117 Link Here
112 
			path = path.trim();
 113 
			path = path.trim();
113 
		}
 114 
		}
114 
		File linkedFile = new File(path);
 115 
		File linkedFile = new File(path);
116 
		// Check if the link target is marked as optional.
117 
		// If link is optional, then the link target may not exist.
118 
		// So IF link is marked as optional AND does not exist, simply ignore it.
119 
		String optional = links.getProperty(LINK_IS_OPTIONAL);
120 
		if (Boolean.valueOf(optional).booleanValue()) {
121 
			if (!linkedFile.exists()) {
122 
				return null;
123 
			}
124 
		}
115 
		if (!linkedFile.isAbsolute()) {
 125 
		if (!linkedFile.isAbsolute()) {
116 
			// link support is relative to the install root
 126 
			// link support is relative to the install root
117 
			File root = Activator.getEclipseHome();
 127 
			File root = Activator.getEclipseHome();

Return to bug 288759