You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/03/25 18:07:03 UTC
[1/2] ant git commit: Preserve exit status on error in /
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 <ac...@gmail.com>
Authored: Wed Mar 23 23:13:53 2016 -0400
Committer: Stefan Bodewig <bo...@apache.org>
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);
}
[2/2] ant git commit: record Anthony Wat's patch, closes #17
Posted by bo...@apache.org.
record Anthony Wat's patch, closes #17
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f8a27a13
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f8a27a13
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f8a27a13
Branch: refs/heads/master
Commit: f8a27a13f9c0255ad2993b01c55bfac7e09911f9
Parents: 04f501e
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Mar 25 18:06:30 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Mar 25 18:06:30 2016 +0100
----------------------------------------------------------------------
WHATSNEW | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/f8a27a13/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 7f9ecbb..a0c575d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -60,6 +60,10 @@ Fixed bugs:
recent Java 9 builds (b108).
Bugzilla Report 59130
+ * <ant> and <antcall> now preserve the ext status set by an <exit>
+ task.
+ Bugzilla Report 59228
+
Other changes:
--------------