Repository: ant Updated Branches: refs/heads/master 11cd7ffab -> f8a27a13f
Preserve exit status on error in <ant>/<antcall> Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/04f501e7 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/04f501e7 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/04f501e7 Branch: refs/heads/master Commit: 04f501e77afd5aa909e1c117e84f7248c687293b Parents: 11cd7ff Author: Anthony Wat <[email protected]> Authored: Wed Mar 23 23:13:53 2016 -0400 Committer: Stefan Bodewig <[email protected]> Committed: Fri Mar 25 18:04:32 2016 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/ProjectHelper.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/04f501e7/src/main/org/apache/tools/ant/ProjectHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index c6eaa07..ab39368 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -562,6 +562,13 @@ public class ProjectHelper { + System.getProperty("line.separator") + ex.getLocation().toString() + ex.getMessage(); + if (ex instanceof ExitStatusException) { + int exitStatus = ((ExitStatusException) ex).getStatus(); + if (newLocation == null) { + return new ExitStatusException(errorMessage, exitStatus); + } + return new ExitStatusException(errorMessage, exitStatus, newLocation); + } if (newLocation == null) { return new BuildException(errorMessage, ex); }
