From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 8 Apr 2009 06:58:56 +0000 (+0000)
Subject: mail subject was wrong when base was renumberd with -n1
X-Git-Tag: 4.3-rc1~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=adeea08356880dc254ffd4bd8f51e47ed0d7b454;p=build.git

mail subject was wrong when base was renumberd with -n1
---

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index f97cad32..f84d51b3 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -121,7 +121,7 @@ function failure() {
 	    echo "See full build log at ${LOG_URL}" ; \
 	    echo "and tail version at ${LOG_URL}.ko" ; \
 	    echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \
-	    tail -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT}" $MAILTO
+	    tail -c 30k ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT} ${BASE}" $MAILTO
     fi
     exit 1
 }
@@ -154,7 +154,7 @@ function success () {
 	    echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
 	    echo "See full build log at ${LOG_URL}" ; \
             [ -n "$DO_TEST" ] && echo "See complete set of testlogs at ${TESTLOGS_URL}" ) \
-	    | mail -s "Success with ${MAIL_SUBJECT}" $MAILTO
+	    | mail -s "Success with ${MAIL_SUBJECT} ${BASE}" $MAILTO
     fi
     exit 0
 }
@@ -467,7 +467,6 @@ function main () {
     else
 	MAIL_SUBJECT="$MAIL_SUBJECT fresh build"
     fi
-    MAIL_SUBJECT="$MAIL_SUBJECT ${BASE}"
 
     if ! in_root_context ; then
         # in the vserver