Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 059C2DA01 for ; Mon, 27 Aug 2012 09:20:17 +0000 (UTC) Received: (qmail 15672 invoked by uid 500); 27 Aug 2012 09:20:16 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 15561 invoked by uid 500); 27 Aug 2012 09:20:16 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 15554 invoked by uid 99); 27 Aug 2012 09:20:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Aug 2012 09:20:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Aug 2012 09:20:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4110D238896F; Mon, 27 Aug 2012 09:19:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1377617 - /incubator/ooo/trunk/main/solenv/bin/build.pl Date: Mon, 27 Aug 2012 09:19:30 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120827091930.4110D238896F@eris.apache.org> Author: af Date: Mon Aug 27 09:19:29 2012 New Revision: 1377617 URL: http://svn.apache.org/viewvc?rev=1377617&view=rev Log: Reverted last change. Modified: incubator/ooo/trunk/main/solenv/bin/build.pl Modified: incubator/ooo/trunk/main/solenv/bin/build.pl URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/build.pl?rev=1377617&r1=1377616&r2=1377617&view=diff ============================================================================== --- incubator/ooo/trunk/main/solenv/bin/build.pl (original) +++ incubator/ooo/trunk/main/solenv/bin/build.pl Mon Aug 27 09:19:29 2012 @@ -2017,7 +2017,10 @@ sub run_job { if (!-d $log_dir) { system("$perl $mkout"); }; - $error_code = system ("$job_to_do 2>&1 | tee $log_file"); + $error_code = system ("$job_to_do > $log_file 2>&1"); + if (!$grab_output && -f $log_file) { + system("cat $log_file"); + }; } else { $error_code = system ("$job_to_do"); };