[gentoo-commits] releng r581 - trunk/tools

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-09-28 20:15:21 +0000 (Sun, 28 Sep 2008)
New Revision: 581

Modified:
   trunk/tools/ChangeLog
   trunk/tools/catalyst-auto
Log:
Add --keep-tmpdir option
Move tailing of logfile to send_email() function

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2008-09-28 19:47:57 UTC (rev 580)
+++ trunk/tools/ChangeLog	2008-09-28 20:15:21 UTC (rev 581)
@@ -3,6 +3,9 @@
 # $Id$
 
   28 Sep 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto:
+  Add --keep-tmpdir option Move tailing of logfile to send_email() function
+
+  28 Sep 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto:
   Add another sed to add the datestamp to the ISO name
 
   28 Sep 2008; Andrew Gaffney <agaffney@g.o>

Modified: trunk/tools/catalyst-auto
===================================================================
--- trunk/tools/catalyst-auto	2008-09-28 19:47:57 UTC (rev 580)
+++ trunk/tools/catalyst-auto	2008-09-28 20:15:21 UTC (rev 581)
@@ -4,6 +4,7 @@
 
 config_file=
 verbose=0
+keep_tmpdir=0
 
 usage() {
   msg=$1
@@ -26,9 +27,16 @@
 
 send_email() {
   subject="${EMAIL_SUBJECT_PREPEND} $1"
-  body=$2
+  message=$2
+  logfile=$3
 
-  echo -e "From: ${EMAIL_FROM}\r\nTo: ${EMAIL_TO}\r\nSubject: ${subject}\r\n\r\n${body}\r\n" | /usr/sbin/sendmail -f ${EMAIL_FROM} ${EMAIL_TO}
+  if [ -n "${logfile}" ]; then
+    body=$(echo -e "${message}\n\n"; tail -n 200 "${logfile}"; echo -e "\n\n\nFull build log at ${logfile}")
+  else
+    body=${message}
+  fi
+
+  echo -e "From: ${EMAIL_FROM}\r\nTo: ${EMAIL_TO}\r\nSubject: ${subject}\r\n\r\n${body}" | /usr/sbin/sendmail -f ${EMAIL_FROM} ${EMAIL_TO}
 }
 
 run_cmd() {
@@ -75,6 +83,9 @@
     --verbose)
       verbose=1
       ;;
+    -k|--keep-tmpdir)
+      keep_tmpdir=1
+      ;;
     -*)
       echo "You have specified an invalid option: ${a}"
       usage
@@ -115,7 +126,7 @@
 done
 
 if ! run_cmd "pre_build" "${TMPDIR}/log/pre_build.log"; then
-  send_email "Catalyst build error - pre_build" "$(echo -e "Your pre_build function sucks\n\n"; tail -n 200 "${TMPDIR}/log/pre_build.log")"
+  send_email "Catalyst build error - pre_build" "Your pre_build function sucks" "${TMPDIR}/log/pre_build.log"
   exit 1
 fi
 
@@ -153,7 +164,7 @@
 
 # Create snapshot
 if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/snapshot.log"; then
-  send_email "Catalyst build error - snapshot" "$(tail -n 200 ${TMPDIR}/log/snapshot.log)"
+  send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"
   exit 1
 fi
 
@@ -161,19 +172,21 @@
   LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
   run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
   if [ $? != 0 ]; then
-    send_email "Catalyst build error - ${i}" "$(tail -n 200 ${LOGFILE})\r\n\r\nFull build log at ${LOGFILE}"
+    send_email "Catalyst build error - ${i}" "" "${LOGFILE}"
     exit 1
   fi
 done
 
 if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
-  send_email "Catalyst build error - post_build" "$(echo -e "Your post_build function sucks\n\n"; tail -n 200 "${TMPDIR}/log/post_build.log")"
+  send_email "Catalyst build error - post_build" "Your post_build function sucks" "${TMPDIR}/log/post_build.log"
   exit 1
 fi
 
 send_email "Catalyst build success" "Everything finished successfully."
 
-if ! rm -rf "${TMPDIR}"; then
-  echo "Could not remove tmpdir ${TMPDIR}!"
-  exit 1
+if [ "${keep_tmpdir}" = 0 ]; then
+  if ! rm -rf "${TMPDIR}"; then
+    echo "Could not remove tmpdir ${TMPDIR}!"
+    exit 1
+  fi
 fi