| commit | af9485f97ba80bccd62e164ef33d8ed800386b79 | [log] [tgz] |
|---|---|---|
| author | Pascal Rapicault <prapicau> | Wed Jun 02 17:39:12 2010 +0000 |
| committer | Pascal Rapicault <prapicau> | Wed Jun 02 17:39:12 2010 +0000 |
| tree | 58d6d95f035057156cd8da3cf73a6f694412f3cf | |
| parent | 1280b37ebe9ba6b586a75e556730258d4d572efb [diff] |
Fix a bug in the support for keep: feature
diff --git a/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/Parser.java b/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/Parser.java index a61e4c1..1ea8f80 100644 --- a/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/Parser.java +++ b/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/Parser.java
@@ -160,7 +160,8 @@ if (line.contains("feature")) { IProvidedCapability[] caps = currentIU.getProvidedCapabilities(); for (int i = 0; i < caps.length; i++) { - keepRequests.add(new RequiredCapability(caps[i].getName(), caps[i].getVersion(), false)); + if (!caps[i].getName().equals(currentIU.getId())) + keepRequests.add(new RequiredCapability(caps[i].getName(), caps[i].getVersion(), false)); } }
diff --git a/org.eclipse.equinox.p2.cudf/tests/testData/testKeep.cudf b/org.eclipse.equinox.p2.cudf/tests/testData/testKeep.cudf index e0b403c..18f6e0f 100644 --- a/org.eclipse.equinox.p2.cudf/tests/testData/testKeep.cudf +++ b/org.eclipse.equinox.p2.cudf/tests/testData/testKeep.cudf
@@ -18,4 +18,5 @@ provides: x=1 request: -update: a +remove: a +