Attachment 164771 Details for Bug 308934 – patch

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

[patch] patch

308934.txt (text/plain), 3.55 KB, created by DJ Houghton

on 2010-04-13 15:59:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: DJ Houghton

Created: 2010-04-13 15:59:28 EDT

Size: 3.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.reconciler.dropins
>Index: src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java,v
>retrieving revision 1.69
>diff -u -r1.69 ProfileSynchronizer.java
>--- src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java	12 Apr 2010 20:57:18 -0000	1.69
>+++ src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java	13 Apr 2010 19:59:12 -0000
>@@ -418,30 +418,29 @@
> 			return null;
> 		}
> 
>-		// if we had some bundles which moved locations then we need to create 2 change requests.
>-		// one will remove the bundle from the profile and then the other will add it back in 
>-		// at the new location
>-		if (!toMove.isEmpty()) {
>-			ReconcilerProfileChangeRequest moveRequest = new ReconcilerProfileChangeRequest(profile, true);
>-			moveRequest.removeAll(toMove);
>-			// force removal of all moved IUs, which will also remove anything which depends on them
>-			// see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=306424#c6
>-			Collection<IRequirement> extraReqs = new ArrayList<IRequirement>();
>-			for (IInstallableUnit unit : toMove) {
>-				IRequirement negation = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, unit.getId(), //
>-						new VersionRange(unit.getVersion(), true, unit.getVersion(), true), null, 0, 0, false);
>-				extraReqs.add(negation);
>-			}
>-			moveRequest.addExtraRequirements(extraReqs);
>-			debug(request);
>-			return moveRequest;
>+		// if we have just a regular add/remove then set up the change request as per normal
>+		if (toMove.isEmpty()) {
>+			context.setExtraInstallableUnits(toAdd);
>+			request.addAll(toAdd);
>+			request.removeAll(toRemove);
>+		} else {
>+			// if we had some bundles which moved locations then we need to create a move change request
>+			// and remove the moved bundles first. The caller of this method will take care of calling us again
>+			// to re-add the bundles at their new location (and other bundles which need adding)
>+			request = new ReconcilerProfileChangeRequest(profile, true);
>+			request.removeAll(toMove);
>+		}
>+
>+		// force removal of all moved and removed IUs, which will also remove anything which depends on them
>+		// see: bug 306424#c6 and bug 308934.
>+		Collection<IRequirement> extraReqs = new ArrayList<IRequirement>();
>+		for (IInstallableUnit unit : request.getRemovals()) {
>+			IRequirement negation = MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, unit.getId(), //
>+					new VersionRange(unit.getVersion(), true, unit.getVersion(), true), null, 0, 0, false);
>+			extraReqs.add(negation);
> 		}
>-
>-		context.setExtraInstallableUnits(toAdd);
>-		request.addAll(toAdd);
>-		request.removeAll(toRemove);
>+		request.addExtraRequirements(extraReqs);
> 		debug(request);
>-
> 		return request;
> 	}
> 
>@@ -518,6 +517,14 @@
> 				Tracing.debug(PREFIX + "Removing IU property: " + entry.getKey() + "->" + entry.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
> 			}
> 		}
>+
>+		Collection<IRequirement> extra = request.getExtraRequirements();
>+		if (extra == null || extra.isEmpty()) {
>+			Tracing.debug(PREFIX + "No extra requirements."); //$NON-NLS-1$
>+		} else {
>+			for (IRequirement requirement : extra)
>+				Tracing.debug(PREFIX + "Extra requirement: " + requirement); //$NON-NLS-1$
>+		}
> 	}
> 
> 	/*

Actions: View | Diff

Attachments on bug 308934: 164746 | 164771