[Libreoffice-commits] .: 2 commits - bin/tinbuild solenv/bin

[Jan Holesovsky]

 bin/tinbuild        |   13 ++++++++-----
 solenv/bin/build.pl |    6 ++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 85952d9be2ef425fadfe008088eea08cbb11380f
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 18 13:32:30 2011 +0100

    tinbuild: Better formatting of the tinderbox info.

diff --git a/bin/tinbuild b/bin/tinbuild
index 819435f..2d29424 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -103,8 +103,8 @@ reportError ()
 		TINDER1=
 		TINDER2=
 		if test "$SEND_MAIL" -eq 1 -a -n "$TINDERNAME" ; then
-			TINDER1=`echo -e "Full log available at http://tinderbox.go-oo.org/MASTER/status.html\n"`
-			TINDER2=`echo "  Box name: $TINDERNAME"`
+			TINDER1="`echo 'Full log available at http://tinderbox.go-oo.org/MASTER/status.html'`"
+			TINDER2="`echo \"Box name: $TINDERNAME\"`"
 		fi
 		cat <<EOF | sendMailMsg "$to_mail" "Tinderbox failure, $message"
 Hi folks,
@@ -112,10 +112,13 @@ Hi folks,
 One of you broke the build of LibreOffice master with your commit :-(
 Please commit and push a fix ASAP!
 
-${TINDER1}Tinderbox info:
+${TINDER1}
 
-${TINDER2}  `uname -a`
-  Configured with `cat autogen.lastrun`
+Tinderbox info:
+
+  ${TINDER2}
+  Machine: `uname -a`
+  Configured with: `cat autogen.lastrun`
 
 Commits since the last success:
 
commit 07874d46ed8ceceaefb65e8fc29285ef5b52dcff
Author: Christian Lohmaier <lohmaier+libreoffice at googlemail.com>
Date:   Fri Feb 18 10:51:52 2011 +0100

    Avoid forking to output the logfile.

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 71f01d7..ad6626f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2031,7 +2031,9 @@ sub run_job {
         };
         $error_code = system ("$job_to_do > $log_file 2>&1");
         if ((!$grab_output || $verbose) && -f $log_file) {
-            system("cat $log_file");
+            open(LOGFILE, "< $log_file");
+            print while(<LOGFILE>);
+            close(LOGFILE);
         };
     } else {
         $error_code = system ("$job_to_do");
@@ -2118,7 +2120,7 @@ sub zenity_enabled {
 
 sub zenity_open {
     if (zenity_enabled()) {
-	$SIG{PIPE} = 'IGNORE';
+        $SIG{PIPE} = 'IGNORE';
         $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
                                "zenity --notification --listen");
     };