Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2009-05-04 16:23:24 -0400
committerDoug Schaefer2009-05-04 16:23:24 -0400
commit39ff4b21052c9e9ea1ba13eb8b252a1e736eda3b (patch)
tree42989a8657bec5e94dc4470e2e862cbd8c652649
parentd8e1c57e58008ecbe5fe6165007c90ab186951bd (diff)
downloadorg.eclipse.cdt-39ff4b21052c9e9ea1ba13eb8b252a1e736eda3b.tar.gz
org.eclipse.cdt-39ff4b21052c9e9ea1ba13eb8b252a1e736eda3b.tar.xz
org.eclipse.cdt-39ff4b21052c9e9ea1ba13eb8b252a1e736eda3b.zip
Fix compile error with M7 p2.
-rw-r--r--p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF3
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/internal/p2/touchpoint/natives/actions/CleanupUntarAction.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF b/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF
index 445a975730..852ecba555 100644
--- a/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF
+++ b/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.p2.engine;bundle-version="1.0.1",
org.eclipse.equinox.p2.metadata.repository;bundle-version="1.0.0",
org.eclipse.equinox.p2.metadata.generator;bundle-version="1.0.1",
- org.eclipse.equinox.p2.publisher;bundle-version="1.0.0"
+ org.eclipse.equinox.p2.publisher;bundle-version="1.0.0",
+ org.eclipse.equinox.p2.repository;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/internal/p2/touchpoint/natives/actions/CleanupUntarAction.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/internal/p2/touchpoint/natives/actions/CleanupUntarAction.java
index f7cd36036b..67e089ab83 100644
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/internal/p2/touchpoint/natives/actions/CleanupUntarAction.java
+++ b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/internal/p2/touchpoint/natives/actions/CleanupUntarAction.java
@@ -3,7 +3,6 @@ package org.eclipse.cdt.internal.p2.touchpoint.natives.actions;
import java.util.Map;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.CleanupzipAction;
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
@@ -28,6 +27,6 @@ public class CleanupUntarAction extends ProvisioningAction {
}
public static IStatus cleanup(Map parameters) {
- return CleanupzipAction.cleanupzip(parameters);
+ return CleanupzipAction.cleanupzip(parameters, false);
}
}

Back to the top