diff options
author | Pascal Rapicault | 2009-02-22 20:00:30 +0000 |
---|---|---|
committer | Pascal Rapicault | 2009-02-22 20:00:30 +0000 |
commit | 1ed2f314b1584e046c036a2382c775f9f91467a4 (patch) | |
tree | 7cb3f0e7aec10c0ecc66ca4563287a456209059a | |
parent | 124c6ac8748779462d2ffe9c3f3121c0b198b6c7 (diff) | |
download | rt.equinox.p2-1ed2f314b1584e046c036a2382c775f9f91467a4.tar.gz rt.equinox.p2-1ed2f314b1584e046c036a2382c775f9f91467a4.tar.xz rt.equinox.p2-1ed2f314b1584e046c036a2382c775f9f91467a4.zip |
Propogate back the status and report build exception
3 files changed, 38 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java index 2e49d3ae6..bea81c67d 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/internal/repository/tools/MirrorApplication.java @@ -37,7 +37,10 @@ public class MirrorApplication extends AbstractApplication { validate(); initializeRepos(new NullProgressMonitor()); IQueryable slice = slice(new NullProgressMonitor()); - mirrorArtifacts(slice, new NullProgressMonitor()); + IStatus mirrorStatus = mirrorArtifacts(slice, new NullProgressMonitor()); + if (mirrorStatus.getSeverity() == IStatus.ERROR) { + return mirrorStatus; + } mirrorMetadata(slice, new NullProgressMonitor()); } finally { finalizeRepositories(); @@ -45,7 +48,7 @@ public class MirrorApplication extends AbstractApplication { return Status.OK_STATUS; } - private void mirrorArtifacts(IQueryable slice, IProgressMonitor monitor) { + private IStatus mirrorArtifacts(IQueryable slice, IProgressMonitor monitor) { Collector ius = slice.query(InstallableUnitQuery.ANY, new Collector(), monitor); ArrayList keys = new ArrayList(ius.size()); for (Iterator iterator = ius.iterator(); iterator.hasNext();) { @@ -57,7 +60,7 @@ public class MirrorApplication extends AbstractApplication { } Mirroring mirror = new Mirroring(getCompositeArtifactRepository(), destinationArtifactRepository, true); mirror.setArtifactKeys((IArtifactKey[]) keys.toArray(new IArtifactKey[keys.size()])); - mirror.run(true, false); + return mirror.run(true, false); } private void mirrorMetadata(IQueryable slice, IProgressMonitor monitor) { diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java index fd0477579..06699c1a5 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/MirrorTask.java @@ -28,13 +28,14 @@ public class MirrorTask extends AbstractRepositoryTask { application.initializeRepos(null); List ius = prepareIUs(); if (ius == null || ius.size() == 0) - throw new BuildException("Need to specify one or more IUs."); + throw new BuildException("Need to specify one or more IUs to mirror."); application.setSourceIUs(ius); IStatus result = application.run(null); - if (result.matches(IStatus.ERROR)) - throw new ProvisionException(result); + if (result.matches(IStatus.ERROR)) { + throw new BuildException(TaskHelper.statusToString(result, null).toString()); + } } catch (ProvisionException e) { - throw new BuildException("Error occurred while transforming repository.", e); + throw new BuildException(e); } } diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java new file mode 100644 index 000000000..7ef184e7c --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src_ant/org/eclipse/equinox/p2/internal/repository/tools/tasks/TaskHelper.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2006 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM - Initial API and implementation + *******************************************************************************/ +package org.eclipse.equinox.p2.internal.repository.tools.tasks; + +import org.eclipse.core.runtime.IStatus; + +public class TaskHelper { + public static StringBuffer statusToString(IStatus status, StringBuffer b) { + IStatus[] nestedStatus = status.getChildren(); + if (b == null) + b = new StringBuffer(); + b.append(status.getMessage()); + for (int i = 0; i < nestedStatus.length; i++) { + b.append('\n'); + b.append(statusToString(nestedStatus[i], b)); + } + return b; + } +} |