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

Collapse All | Expand All

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 4-10 Link Here
4
Bundle-Name: %pluginName
4
Bundle-Name: %pluginName
5
Bundle-Vendor: %providerName
5
Bundle-Vendor: %providerName
6
Bundle-Localization: plugin
6
Bundle-Localization: plugin
7
Bundle-Version: 1.0.100.qualifier
7
Bundle-Version: 1.0.0.qualifier
8
Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
8
Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
9
 org.eclipse.equinox.internal.provisional.p2.core,
9
 org.eclipse.equinox.internal.provisional.p2.core,
10
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
10
 org.eclipse.equinox.internal.provisional.p2.core.eventbus,
(-)src/org/eclipse/equinox/internal/p2/director/Projector.java (-1 / +7 lines)
Lines 342-351 Link Here
342
					if (isApplicable(reqs[i][1])) {
342
					if (isApplicable(reqs[i][1])) {
343
						genericExpandRequirement(" -1 " + getVariable(patch) + " -1 " + getVariable(iu), iu, reqs[i][1], " >= -1", " 1 " + getVariable(patch) + "=0;"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
343
						genericExpandRequirement(" -1 " + getVariable(patch) + " -1 " + getVariable(iu), iu, reqs[i][1], " >= -1", " 1 " + getVariable(patch) + "=0;"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
344
					}
344
					}
345
346
					//P1 -> B
347
					if (reqs[i][0] == null)
348
						expandRequirement(getVariable(patch), patch, reqs[i][1]);
349
345
					//Generate dependency when the patch is not applied
350
					//Generate dependency when the patch is not applied
346
					//-P1 -> A -> B ( equiv. -P1 & A -> B equiv 1 P1 - 1 A + 1 B >= 0)
351
					//-P1 -> A -> B ( equiv. -P1 & A -> B equiv 1 P1 - 1 A + 1 B >= 0)
347
					if (isApplicable(reqs[i][0]))
352
					if (reqs[i][0] != null && isApplicable(reqs[i][0]))
348
						genericExpandRequirement(" 1 " + getVariable(patch) + " -1 " + getVariable(iu), iu, reqs[i][0], " >= 0", implies(getVariable(iu), getVariable(patch))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
353
						genericExpandRequirement(" 1 " + getVariable(patch) + " -1 " + getVariable(iu), iu, reqs[i][0], " >= 0", implies(getVariable(iu), getVariable(patch))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
354
349
				}
355
				}
350
				addOptionalityExpression();
356
				addOptionalityExpression();
351
			}
357
			}

Return to bug 260582