peterreilly 2004/10/21 03:31:30
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ExecTask.java
Log:
sync
Revision Changes Path
No revision
No revision
1.503.2.140 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.139
retrieving revision 1.503.2.140
diff -u -r1.503.2.139 -r1.503.2.140
--- WHATSNEW 30 Sep 2004 17:34:05 -0000 1.503.2.139
+++ WHATSNEW 21 Oct 2004 10:31:30 -0000 1.503.2.140
@@ -54,6 +54,9 @@
* Execution of top level tasks in imported files get delayed by targets.
Bugzilla report 31487.
+* ExecTask executes checkConfiguration() even though os does not match.
+ Bugzilla report 31805.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
No revision
No revision
1.61.2.10 +8 -6 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.61.2.9
retrieving revision 1.61.2.10
diff -u -r1.61.2.9 -r1.61.2.10
--- ExecTask.java 23 Jun 2004 19:17:12 -0000 1.61.2.9
+++ ExecTask.java 21 Oct 2004 10:31:30 -0000 1.61.2.10
@@ -430,15 +430,17 @@
* </ul>
*/
public void execute() throws BuildException {
+ // Quick fail if this is not a valid OS for the command
+ if (!isValidOs()) {
+ return;
+ }
File savedDir = dir; // possibly altered in prepareExec
cmdl.setExecutable(resolveExecutable(executable, false));
checkConfiguration();
- if (isValidOs()) {
- try {
- runExec(prepareExec());
- } finally {
- dir = savedDir;
- }
+ try {
+ runExec(prepareExec());
+ } finally {
+ dir = savedDir;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
