summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2013-04-24 21:17:14 (EDT)
committerPascal Rapicault2013-04-24 21:17:14 (EDT)
commit96d7417ca3ca04c73de23289cccad9c8e9428365 (patch)
treeccbcccc9dc057e1f407913553d15d1639cfeec47
parentddc5f7e7d8f44002de4b8d72ceef7e5a5599b5a2 (diff)
downloadrt.equinox.p2-96d7417ca3ca04c73de23289cccad9c8e9428365.zip
rt.equinox.p2-96d7417ca3ca04c73de23289cccad9c8e9428365.tar.gz
rt.equinox.p2-96d7417ca3ca04c73de23289cccad9c8e9428365.tar.bz2
Extract profile from profile change request
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java
index bc021b4..28bed3a 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RemediationOperation.java
@@ -15,7 +15,6 @@ import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest;
import org.eclipse.equinox.internal.p2.operations.Messages;
import org.eclipse.equinox.internal.p2.operations.RequestFlexer;
-import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.planner.IPlanner;
import org.eclipse.equinox.p2.planner.IProfileChangeRequest;
@@ -160,15 +159,13 @@ public class RemediationOperation extends ProfileChangeOperation {
Remedy remedy = new Remedy();
remedy.setConfig(configuration);
IPlanner planner = session.getPlanner();
- IProfile profile = session.getProfileRegistry().getProfile(profileId);
- //request = (ProfileChangeRequest) originalRequest.clone();
RequestFlexer av = new RequestFlexer(planner);
av.setAllowDifferentVersion(configuration.allowDifferentVersion);
av.setAllowInstalledElementChange(configuration.allowInstalledUpdate);
av.setAllowInstalledElementRemoval(configuration.allowInstalledRemoval);
av.setAllowPartialInstall(configuration.allowPartialInstall);
av.setProvisioningContext(getProvisioningContext());
- remedy.setRequest((ProfileChangeRequest) av.getChangeRequest(originalRequest, profile, monitor));
+ remedy.setRequest((ProfileChangeRequest) av.getChangeRequest(originalRequest, ((ProfileChangeRequest) originalRequest).getProfile(), monitor));
if (remedy.getRequest() == null)
return null;