bodewig 2003/09/25 07:52:53
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Execute.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.68.2.2 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
Index: Execute.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
retrieving revision 1.68.2.1
retrieving revision 1.68.2.2
diff -u -r1.68.2.1 -r1.68.2.2
--- Execute.java 25 Sep 2003 12:36:31 -0000 1.68.2.1
+++ Execute.java 25 Sep 2003 14:52:52 -0000 1.68.2.2
@@ -124,7 +124,7 @@
// Ignore and keep trying
}
- if (Os.isFamily("mac")) {
+ if (Os.isFamily("mac") && !Os.isFamily("unix")) {
// Mac
shellLauncher = new MacCommandLauncher(new CommandLauncher());
} else if (Os.isFamily("os/2")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
