From 8e31a81490472839c6d0a794d889d898ee55bcce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mar 11 2018 17:17:06 +0000 Subject: spam-o-matic: make composes less noisy spam-o-matic does not understand rich deps, lets run it stioll but not have its output emailed out as it is broken Signed-off-by: Dennis Gilmore --- diff --git a/nightly.sh b/nightly.sh index fdfaf90..cc14f41 100755 --- a/nightly.sh +++ b/nightly.sh @@ -95,7 +95,8 @@ if [ "$RELEASE" = "rawhide" ]; then else TREENAME="F-$RELEASE" fi -/usr/share/mash/spam-o-matic --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck" +# disable sending email for now as spam-o-matic does not understand Rich dependencies +/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck" [ -z "$ARCH" ] && { ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log @@ -190,9 +191,11 @@ send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete # Tell everyone by email about the compose +# "$DESTDIR/logs/depcheck" lets not cat out depcheck for now as it does +# not understand rich dependencies SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes' for tomail in $TOMAIL ; do - cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \ + cat $DESTDIR/logs/*verbose | \ mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail done