X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-nightly.sh;h=0e963817f12110bf1257c680c97ac98e81127d14;hb=5dca05ea01b681e937599f9ed046567cbff27b9a;hp=483c5f4d632ba40c28b31e723d685a2055ff631e;hpb=983e1db82ea838e114af299d5294748442c2e303;p=build.git

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 483c5f4d..0e963817 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -165,6 +165,7 @@ function success () {
     webpublish_cp_local_to_remote $LOG $WEBLOG
     summary $LOG | webpublish_append_stdin_to_file $WEBLOG
     if [ -n "$DO_TEST" ] ; then
+	short_message="PASS"
 	( \
 	    echo "Successfully built and tested" ; \
 	    echo "see build results at        $WEBBASE_URL" ; \
@@ -173,6 +174,7 @@ function success () {
 	    ) | webpublish_cp_stdin_to_file $WEBBASE.pass
 	webpublish rm -f $WEBBASE.pkg-ok $WEBBASE.ko
     else
+	short_message="PKGOK"
 	( \
 	    echo "Successful package-only build, no test requested" ; \
 	    echo "see build results at        $WEBBASE_URL" ; \
@@ -182,7 +184,7 @@ function success () {
     fi
     if [ -n "$MAILTO" ] ; then
 	( \
-	    echo "Subject: PASS ${BASE} ${MAIL_SUBJECT}" ; \
+	    echo "Subject: $short_message ${BASE} ${MAIL_SUBJECT}" ; \
 	    echo "To: $MAILTO" ; \
 	    echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
 	    echo "see build results at        $WEBBASE_URL" ; \
@@ -723,10 +725,10 @@ function main () {
 	else
 	    # run scanpackages so we can use apt-get on this
 	    # (not needed on fedora b/c this is done by the regular build already)
-	    vserver $BASE exec bash -c "(cd /build ; dpkg-scanpackages DEBIAN/ | gzip -9c > DEBIAN/Packages.gz)"
+	    vserver $BASE exec bash -c "(cd /build ; dpkg-scanpackages DEBIAN/ | gzip -9c > Packages.gz)"
 	    webpublish mkdir -p $WEBPATH/$BASE/DEBIAN
 	    webpublish_rsync_files $WEBPATH/$BASE/DEBIAN/ /vservers/$BASE/build/DEBIAN/*.deb 
-	    webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/DEBIAN/*.gz
+	    webpublish_rsync_files $WEBPATH/$BASE/ /vservers/$BASE/build/Packages.gz
 	fi
 	# publish myplc-release if this exists
 	release=/vservers/$BASE/build/myplc-release