Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2010-11-11 19:22:22 +0000
committerDJ Houghton2010-11-11 19:22:22 +0000
commit0a9445cd6b5090d34f25661becf960b5214d5168 (patch)
tree09a4670bf1c2f6388886db1bda33f96d1f5b1e85
parenta85cb857a25287dd4bf53f7aae722832f1aec3fc (diff)
downloadrt.equinox.p2-0a9445cd6b5090d34f25661becf960b5214d5168.tar.gz
rt.equinox.p2-0a9445cd6b5090d34f25661becf960b5214d5168.tar.xz
rt.equinox.p2-0a9445cd6b5090d34f25661becf960b5214d5168.zip
Bug 326541 - Plan Verifier results not checked in reconcilerR36x_v20101111-1400
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
index a0293d727..bbd10036a 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.reconciler.dropins;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.reconciler.dropins.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
index 5e5bea0bb..bfdc05e5d 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
@@ -702,6 +702,11 @@ public class ProfileSynchronizer {
* Execute the given plan.
*/
private IStatus executePlan(IProvisioningPlan plan, ProvisioningContext provisioningContext, IProgressMonitor monitor) {
+ // the plan verifier has been given the opportunity to veto the plan. check to see if that was the case.
+ // warnings are ignored
+ if (plan.getStatus().getSeverity() == IStatus.ERROR)
+ return plan.getStatus();
+
IEngine engine = (IEngine) agent.getService(IEngine.SERVICE_NAME);
IPhaseSet phaseSet = PhaseSetFactory.createDefaultPhaseSetExcluding(new String[] {PhaseSetFactory.PHASE_COLLECT, PhaseSetFactory.PHASE_CHECK_TRUST});

Back to the top