diff options
| author | Pascal Rapicault | 2009-03-16 00:47:22 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2009-03-16 00:47:22 +0000 |
| commit | 87377e296da41d88cf377ca2dec035a8d0ba41e2 (patch) | |
| tree | 1169db42f63765c6601076cb32f0ba29a6e020e5 /bundles | |
| parent | 7f206a32a0d393ea79c1962f9c063f7e397f7ce6 (diff) | |
| download | rt.equinox.p2-87377e296da41d88cf377ca2dec035a8d0ba41e2.tar.gz rt.equinox.p2-87377e296da41d88cf377ca2dec035a8d0ba41e2.tar.xz rt.equinox.p2-87377e296da41d88cf377ca2dec035a8d0ba41e2.zip | |
Bug 258988 - [mirror] p2 mirroring app incorrectly reports warnings
Diffstat (limited to 'bundles')
2 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java index 93209840a..728676220 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java @@ -67,7 +67,10 @@ public class MirrorApplication implements IApplication { IStatus result = mirroring.run(failOnError, verbose); if (!result.isOK()) { //only noteworthy statuses should be resulted from mirroring.run - System.err.println("Mirroring completed with warnings and/or errors. Please check log file for more information."); //$NON-NLS-1$ + if (result.matches(IStatus.INFO)) + System.err.println("Mirroring completed. Please check log file for more information."); //$NON-NLS-1$ + else + System.err.println("Mirroring completed with warnings and/or errors. Please check log file for more information."); //$NON-NLS-1$ FrameworkLog log = (FrameworkLog) ServiceHelper.getService(Activator.getContext(), FrameworkLog.class.getName()); if (log != null) System.err.println("Log file location: " + log.getFile()); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirroring.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirroring.java index 35e1f7d39..ac78ba060 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirroring.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirroring.java @@ -137,7 +137,7 @@ public class Mirroring { if (compare) return compareToDestination(descriptor, e); String message = NLS.bind(Messages.mirror_alreadyExists, descriptor, destination); - return new Status(IStatus.INFO, Activator.ID, ProvisionException.ARTIFACT_EXISTS, message, e); + return new Status(IStatus.INFO, Activator.ID, ProvisionException.ARTIFACT_EXISTS, message, null); } return e.getStatus(); } |