Attachment 169205 Details for Bug 313615 – patch

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

[patch] patch

313615.txt (text/plain), 2.54 KB, created by Andrew Niefer

on 2010-05-19 15:53:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-05-19 15:53:50 EDT

Size: 2.54 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.repository.tools
>Index: src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java,v
>retrieving revision 1.20
>diff -u -r1.20 MirrorApplication.java
>--- src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java	12 May 2010 01:44:44 -0000	1.20
>+++ src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java	19 May 2010 19:53:29 -0000
>@@ -182,7 +182,7 @@
> 			IQueryable<IInstallableUnit> slice = slice(new NullProgressMonitor());
> 			if (destinationArtifactRepository != null) {
> 				mirrorStatus = mirrorArtifacts(slice, new NullProgressMonitor());
>-				if (mirrorStatus.getSeverity() == IStatus.ERROR)
>+				if (failOnError && mirrorStatus.getSeverity() == IStatus.ERROR)
> 					return mirrorStatus;
> 			}
> 			if (destinationMetadataRepository != null)
>Index: src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java,v
>retrieving revision 1.8
>diff -u -r1.8 MirrorTask.java
>--- src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java	9 Apr 2010 20:15:37 -0000	1.8
>+++ src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java	19 May 2010 19:53:29 -0000
>@@ -27,6 +27,7 @@
> 
> 	private File mirrorLog; // file to log mirror output to (optional)
> 	private ComparatorDescription comparator;
>+	private boolean ignoreErrors = false;
> 
> 	public MirrorTask() {
> 		application = new MirrorApplication();
>@@ -59,7 +60,7 @@
> 			List<IInstallableUnit> ius = prepareIUs();
> 			application.setSourceIUs(ius);
> 			IStatus result = application.run(null);
>-			if (result.matches(IStatus.ERROR))
>+			if (!ignoreErrors && result.matches(IStatus.ERROR))
> 				throw new BuildException(TaskHelper.statusToString(result, IStatus.ERROR, null).toString());
> 		} catch (ProvisionException e) {
> 			throw new BuildException(e);
>@@ -111,6 +112,7 @@
> 	 * Set whether or not we should ignore errors when running the mirror application.
> 	 */
> 	public void setIgnoreErrors(boolean value) {
>+		ignoreErrors = value;
> 		((MirrorApplication) application).setIgnoreErrors(value);
> 	}
>

Actions: View | Diff

Attachments on bug 313615: 169205