Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordj2011-07-27 14:38:17 -0400
committerdj2011-07-27 14:38:17 -0400
commit3835f14b44da9967c8858284b6c87937b8b13c6b (patch)
tree0e787d5b28d4d84371eb16531fa0a2d9c0c78651
parentc5849e4e4b34eb67b11eba909ef2f61c71d30538 (diff)
downloadrt.equinox.p2-3835f14b44da9967c8858284b6c87937b8b13c6b.tar.gz
rt.equinox.p2-3835f14b44da9967c8858284b6c87937b8b13c6b.tar.xz
rt.equinox.p2-3835f14b44da9967c8858284b6c87937b8b13c6b.zip
Bug 350088 - [publisher] Produced patches don't match specific feature
version numbers
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
index f2b01207c..9e7126966 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/FeaturesAction.java
@@ -566,12 +566,17 @@ public class FeaturesAction extends AbstractPublisherAction {
return VersionRange.emptyRange;
if (!entry.isRequires())
return new VersionRange(version, true, version, true);
- if (match == null)
+ if (match == null) {
+ if (entry.isPatch()) {
+ org.osgi.framework.Version osgiVersion = PublisherHelper.toOSGiVersion(version);
+ Version upper = Version.createOSGi(osgiVersion.getMajor() + 1, 0, 0);
+ return new VersionRange(version, true, upper, false);
+ }
// TODO should really be returning VersionRange.emptyRange here...
return null;
+ }
if (match.equals("perfect")) //$NON-NLS-1$
return new VersionRange(version, true, version, true);
-
org.osgi.framework.Version osgiVersion = PublisherHelper.toOSGiVersion(version);
if (match.equals("equivalent")) { //$NON-NLS-1$
Version upper = Version.createOSGi(osgiVersion.getMajor(), osgiVersion.getMinor() + 1, 0);

Back to the top