diff options
author | DJ Houghton | 2010-07-05 14:30:40 +0000 |
---|---|---|
committer | DJ Houghton | 2010-07-05 14:30:40 +0000 |
commit | cdc996506b79e25dbb07b8f441e10e7f0d583e23 (patch) | |
tree | 48762aaaeb58000029ca34bd6ecda2325f6b2b73 | |
parent | c429aa10ae0c357259daf0e41e1687621d3b9364 (diff) | |
download | rt.equinox.p2-cdc996506b79e25dbb07b8f441e10e7f0d583e23.tar.gz rt.equinox.p2-cdc996506b79e25dbb07b8f441e10e7f0d583e23.tar.xz rt.equinox.p2-cdc996506b79e25dbb07b8f441e10e7f0d583e23.zip |
Bug 303203 - [planner] P2 does not pick up higher version of already installed plug-in from dropinsR35x_v20100705R3_5_maintenance
-rw-r--r-- | bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF index e5918c615..9d6dcfd90 100644 --- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.director;singleton:=true Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 1.0.101.qualifier +Bundle-Version: 1.0.102.qualifier Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.provisional.configurator, org.eclipse.equinox.internal.provisional.p2.core, diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java index c5fe53964..a079067c1 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java @@ -643,7 +643,8 @@ public class SimplePlanner implements IPlanner { if (profileRequirement == null) { profileRequirement = createRequirement(iu, profileChangeRequest.getProfile().getInstallableUnitProperty(iu, INCLUSION_RULES)); } - gatheredRequirements.add(profileRequirement); + if (!gatheredRequirements.contains(profileRequirement)) + gatheredRequirements.add(profileRequirement); } //Now add any other requirement that we need to see satisfied |