[Libreoffice-commits] .: bin/tinbuild

[Jan Holesovsky]

 bin/tinbuild |   29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 2311372f68e3e244e74ddaec5836423e41a11757
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Oct 8 17:05:40 2010 +0200

    Improve tinderbox mail message.

diff --git a/bin/tinbuild b/bin/tinbuild
index c063e44..97a6bbd 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -56,12 +56,24 @@ reportError ()
 	if test -n "$to_mail" ; then
 		subject="Tinderbox failure, $message"
 		(
-			echo "On a tinderbox"
-			echo "  `uname -a`"
-			echo "configured with:"
-			grep '\$ \.\/configure' config.log
-			echo
-			echo "$*"
+			cat <<EOF
+Hi guys,
+
+One of you broke the build of LibreOffice master with your commit :-(
+Please commit and push a fix ASAP!
+
+The tinderbox
+
+  `uname -a`
+
+configured with
+
+  `grep '\$ \.\/configure' config.log`
+
+says:
+
+"$*"
+EOF
 		) | mail -r "$OWNER" -s "$subject" $to_mail
 	else
 		echo "$*" 1>&2
@@ -120,7 +132,7 @@ while true; do
 	elif ! err_msg=$(./download 2>&1); then
 		reportError committer "download failed - error is:" $'\n' "$err_msg"
 	elif ! $NICE make dev-install >build.log 2>&1 ; then
-		reportError committer "building failed - error is:" $'\n' "$(tail -n50 build.log)"
+		reportError committer "building failed - error is:" $'\n' "$(tail -n100 build.log)"
 	else
 		echo build done
 
@@ -137,6 +149,9 @@ while true; do
 			reportError owner "Cannot move 'build' to 'build-$good_head'" "$msg"
 		}
 
+		# save it at least for one build
+		mv build.log "build-previous.log"
+
 		if test -n "$prev_head"; then
 			rm -rf "build-$prev_head"
 		fi