Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 7733 invoked from network); 25 Sep 2003 14:52:57 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 25 Sep 2003 14:52:57 -0000 Received: (qmail 10670 invoked by uid 500); 25 Sep 2003 14:52:48 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 10621 invoked by uid 500); 25 Sep 2003 14:52:48 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 10608 invoked by uid 500); 25 Sep 2003 14:52:48 -0000 Received: (qmail 10587 invoked from network); 25 Sep 2003 14:52:48 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 25 Sep 2003 14:52:48 -0000 Received: (qmail 7701 invoked by uid 1146); 25 Sep 2003 14:52:53 -0000 Date: 25 Sep 2003 14:52:53 -0000 Message-ID: <20030925145253.7700.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Execute.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org