Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2009-04-08 21:23:44 +0000
committerPascal Rapicault2009-04-08 21:23:44 +0000
commit68ed30259e35cacf1994661f087ced7e104579cc (patch)
tree9d17f41ffb61d88e19d220420b0df9747e53d896 /bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox
parent6e8e3254eb61ad6596408f6af8aa29b83b026067 (diff)
downloadrt.equinox.p2-68ed30259e35cacf1994661f087ced7e104579cc.tar.gz
rt.equinox.p2-68ed30259e35cacf1994661f087ced7e104579cc.tar.xz
rt.equinox.p2-68ed30259e35cacf1994661f087ced7e104579cc.zip
Translate message
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox')
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties1
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlanExecutionHelper.java3
3 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java
index 623ce10b4..a79bec113 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java
@@ -32,6 +32,8 @@ public class Messages extends NLS {
public static String Director_Task_Resolving_Dependencies;
public static String Director_Unsatisfied_Dependencies;
public static String Director_Unsatisfied_Dependency;
+ public static String Director_error_applying_configuration;
+
public static String Explanation_alreadyInstalled;
public static String Explanation_from;
public static String Explanation_hardDependency;
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties
index 0add0bec7..4b9f2b1d6 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties
@@ -15,6 +15,7 @@ Director_Unexpected_IU=The installable unit {0} can not be used here.
Director_Task_Installing=Installing into {0}
Director_Task_Updating=Updating
Director_Task_Resolving_Dependencies=Calculating requirements and dependencies.
+Director_error_applying_configuration=Unexpected failure applying configuration after for the installer plan execution.
Director_Unsatisfied_Dependencies=\
Cannot complete the install because some dependencies are not satisfiable
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlanExecutionHelper.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlanExecutionHelper.java
index 33fd00457..e31aa2c0c 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlanExecutionHelper.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlanExecutionHelper.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.internal.p2.director.DirectorActivator;
+import org.eclipse.equinox.internal.p2.director.Messages;
import org.eclipse.equinox.internal.provisional.configurator.Configurator;
import org.eclipse.equinox.internal.provisional.p2.engine.*;
@@ -20,7 +21,7 @@ public class PlanExecutionHelper {
try {
configChanger.applyConfiguration();
} catch (IOException e) {
- return new Status(IStatus.ERROR, DirectorActivator.PI_DIRECTOR, "Unexpected failure applying configuration", e);
+ return new Status(IStatus.ERROR, DirectorActivator.PI_DIRECTOR, Messages.Director_error_applying_configuration, e);
}
}
return engine.perform(result.getProfileChangeRequest().getProfile(), new DefaultPhaseSet(), result.getOperands(), context, progress);

Back to the top