Attachment 136104 Details for Bug 276133 – Patch fixing the problem in the SimplePlanner

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch fixing the problem in the SimplePlanner

276133.patch (text/plain), 2.60 KB, created by Pascal Rapicault

on 2009-05-16 15:39:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2009-05-16 15:39:58 EDT

Size: 2.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java,v
>retrieving revision 1.87
>diff -u -r1.87 SimplePlanner.java
>--- src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java	13 May 2009 15:46:48 -0000	1.87
>+++ src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java	16 May 2009 19:39:54 -0000
>@@ -289,8 +289,20 @@
> 		return satisfyMetaRequirements(p.getProperties());
> 	}
> 
>-	//Return the set of IUs representing the complete future state of the profile to satisfy the request or return a ProvisioningPlan when the request can not be satisfied
> 	private Object getSolutionFor(ProfileChangeRequest profileChangeRequest, ProvisioningContext context, IProgressMonitor monitor) {
>+		Object solution = getBasicSolutionFor(profileChangeRequest, context, monitor);
>+		if (solution instanceof Projector) {
>+			ProvisioningContext ctx = new ProvisioningContext(new URI[0]);
>+			ctx.setExtraIUs(new ArrayList(((Projector) solution).extractSolution()));
>+			solution = null;
>+			ctx.setProperty(INCLUDE_PROFILE_IUS, "false"); //$NON-NLS-1$
>+			return getBasicSolutionFor(profileChangeRequest, ctx, monitor);
>+		}
>+		return solution;
>+	}
>+
>+	//Return the set of IUs representing the complete future state of the profile to satisfy the request or return a ProvisioningPlan when the request can not be satisfied
>+	private Object getBasicSolutionFor(ProfileChangeRequest profileChangeRequest, ProvisioningContext context, IProgressMonitor monitor) {
> 		SubMonitor sub = SubMonitor.convert(monitor, ExpandWork);
> 		sub.setTaskName(Messages.Director_Task_Resolving_Dependencies);
> 		try {
>@@ -310,6 +322,9 @@
> 
> 			Slicer slicer = new Slicer(new QueryableArray(availableIUs), newSelectionContext, satisfyMetaRequirements(profileChangeRequest.getProfileProperties()));
> 			IQueryable slice = slicer.slice(new IInstallableUnit[] {(IInstallableUnit) updatedPlan[0]}, sub.newChild(ExpandWork / 4));
>+			//			Why w = new Why(slice);
>+			//			w.why("org.eclipse.tptp.platform.agentcontroller", (IInstallableUnit) updatedPlan[0]);
>+			//			w.why("org.eclipse.tptp.platform.iac.administrator", (IInstallableUnit) updatedPlan[0]);
> 			if (slice == null)
> 				return new ProvisioningPlan(slicer.getStatus(), profileChangeRequest, null);
> 			Projector projector = new Projector(slice, newSelectionContext, satisfyMetaRequirements(profileChangeRequest.getProfileProperties()));

Actions: View | Diff

Attachments on bug 276133: 135643 | 136104 | 136107 | 136141