Attachment 129006 Details for Bug 231200 – patch

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

[patch] patch

bug231200.patch (text/plain), 6.99 KB, created by Susan McCourt

on 2009-03-16 17:40:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Susan McCourt

Created: 2009-03-16 17:40:08 EDT

Size: 6.99 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java,v
>retrieving revision 1.22
>diff -u -r1.22 InstallAction.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java	3 Mar 2009 21:57:53 -0000	1.22
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java	16 Mar 2009 21:39:28 -0000
>@@ -61,13 +61,23 @@
> 				// If the iu is a newer version of something already installed, consider this an
> 				// update request
> 				if (compareTo > 0) {
>-					request.addInstallableUnits(new IInstallableUnit[] {ius[i]});
>-					request.removeInstallableUnits(new IInstallableUnit[] {installedIU});
>+					boolean lockedForUpdate = false;
>+					String value = profile.getInstallableUnitProperty(ius[i], IInstallableUnit.PROP_PROFILE_LOCKED_IU);
>+					if (value != null)
>+						lockedForUpdate = (Integer.parseInt(value) & IInstallableUnit.LOCK_UPDATE) == IInstallableUnit.LOCK_UPDATE;
>+					if (lockedForUpdate) {
>+						// Add a status telling the user that this implies an update, but the
>+						// iu should not be updated
>+						status.merge(PlanAnalyzer.getStatus(IStatusCodes.ALTERED_IGNORED_IMPLIED_UPDATE, ius[i]));
>+					} else {
>+						request.addInstallableUnits(new IInstallableUnit[] {ius[i]});
>+						request.removeInstallableUnits(new IInstallableUnit[] {installedIU});
>+						// Add a status informing the user that the update has been inferred
>+						status.merge(PlanAnalyzer.getStatus(IStatusCodes.ALTERED_IMPLIED_UPDATE, ius[i]));
>+					}
> 					// Mark it as a root if it hasn't been already
> 					if (!Boolean.toString(true).equals(profile.getInstallableUnitProperty(installedIU, IInstallableUnit.PROP_PROFILE_ROOT_IU)))
> 						request.setInstallableUnitProfileProperty(ius[i], IInstallableUnit.PROP_PROFILE_ROOT_IU, Boolean.toString(true));
>-					// Add a status informing the user that the update has been inferred
>-					status.merge(PlanAnalyzer.getStatus(IStatusCodes.ALTERED_IMPLIED_UPDATE, ius[i]));
> 				} else if (compareTo < 0) {
> 					// An implied downgrade.  We will not put this in the plan, add a status informing the user
> 					status.merge(PlanAnalyzer.getStatus(IStatusCodes.ALTERED_IGNORED_IMPLIED_DOWNGRADE, ius[i]));
>Index: src/org/eclipse/equinox/internal/p2/ui/messages.properties
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties,v
>retrieving revision 1.83
>diff -u -r1.83 messages.properties
>--- src/org/eclipse/equinox/internal/p2/ui/messages.properties	11 Mar 2009 16:05:15 -0000	1.83
>+++ src/org/eclipse/equinox/internal/p2/ui/messages.properties	16 Mar 2009 21:39:28 -0000
>@@ -159,6 +159,7 @@
> 
> PlanAnalyzer_IgnoringInstall="{0}" is not applicable to the current configuration and will not be installed.
> PlanAnalyzer_IgnoringUninstall="{0}" cannot be uninstalled because other installed software depends on it.
>+PlanAnalyzer_LockedImpliedUpdate0={0} will be ignored because it is already installed, and updates are not permitted.
> PlanAnalyzer_PartialInstall="{0}" is partially installed because other installed software requires it.  The remainder will be installed.
> PlanAnalyzer_PartialUninstall= "{0}" cannot be fully uninstalled because other installed software requires it.  The parts that are not required will be uninstalled.
> PlanAnalyzer_SideEffectInstall="{0}" will also be installed in order to complete this operation.
>Index: src/org/eclipse/equinox/internal/p2/ui/PlanAnalyzer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/PlanAnalyzer.java,v
>retrieving revision 1.3
>diff -u -r1.3 PlanAnalyzer.java
>--- src/org/eclipse/equinox/internal/p2/ui/PlanAnalyzer.java	26 Jan 2009 22:29:13 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/ui/PlanAnalyzer.java	16 Mar 2009 21:39:28 -0000
>@@ -38,6 +38,8 @@
> 				return new MultiStatus(ProvUIActivator.PLUGIN_ID, statusCode, ProvUIMessages.PlanStatusHelper_RequestAltered, null);
> 			case IStatusCodes.ALTERED_IMPLIED_UPDATE :
> 				return new Status(IStatus.INFO, ProvUIActivator.PLUGIN_ID, statusCode, NLS.bind(ProvUIMessages.PlanStatusHelper_ImpliedUpdate, getIUString(affectedIU)), null);
>+			case IStatusCodes.ALTERED_IGNORED_IMPLIED_UPDATE :
>+				return new Status(IStatus.WARNING, ProvUIActivator.PLUGIN_ID, statusCode, NLS.bind(ProvUIMessages.PlanAnalyzer_LockedImpliedUpdate0, getIUString(affectedIU)), null);
> 			case IStatusCodes.ALTERED_IGNORED_IMPLIED_DOWNGRADE :
> 				return new Status(IStatus.WARNING, ProvUIActivator.PLUGIN_ID, statusCode, NLS.bind(ProvUIMessages.PlanStatusHelper_IgnoringImpliedDowngrade, getIUString(affectedIU)), null);
> 			case IStatusCodes.ALTERED_IGNORED_ALREADY_INSTALLED :
>Index: src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java,v
>retrieving revision 1.68
>diff -u -r1.68 ProvUIMessages.java
>--- src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java	11 Mar 2009 16:05:15 -0000	1.68
>+++ src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java	16 Mar 2009 21:39:28 -0000
>@@ -187,6 +187,7 @@
> 	public static String UpdateAction_UpdatesAvailableTitle;
> 	public static String PlanAnalyzer_IgnoringInstall;
> 	public static String PlanAnalyzer_IgnoringUninstall;
>+	public static String PlanAnalyzer_LockedImpliedUpdate0;
> 	public static String PlanAnalyzer_PartialInstall;
> 	public static String PlanAnalyzer_PartialUninstall;
> 	public static String PlanAnalyzer_SideEffectInstall;
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java,v
>retrieving revision 1.5
>diff -u -r1.5 IStatusCodes.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java	21 Jan 2009 23:42:31 -0000	1.5
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/IStatusCodes.java	16 Mar 2009 21:39:28 -0000
>@@ -38,6 +38,7 @@
> 	public static final int ALTERED_SIDE_EFFECT_INSTALL = 10010;
> 	public static final int ALTERED_IGNORED_INSTALL_REQUEST = 10011;
> 	public static final int ALTERED_IGNORED_UNINSTALL_REQUEST = 10012;
>+	public static final int ALTERED_IGNORED_IMPLIED_UPDATE = 10013;
> 
> 	// Status codes associated with inability to perform an operation
> 	public static final int UNEXPECTED_NOTHING_TO_DO = 10050;

Actions: View | Diff

Attachments on bug 231200: 99745 | 129006 | 129264 | 129276