[releng] sync buildbranched/rawhide more

[Till Maas]

commit b54c90af7605ab46a5c3b264e54bd6dc2c20bffc
Author: Till Maas <opensource at till.name>
Date:   Tue Sep 30 17:21:34 2014 +0200

    sync buildbranched/rawhide more

 scripts/buildbranched |   17 ++++++++++++-----
 scripts/buildrawhide  |    9 +++++----
 2 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 623379b..79dbfd9 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -17,7 +17,7 @@ EXPANDARCH=""
 DEPOPTS="--treename F-$BRANCHED"
 MASHOPTS=""
 MOCKCONFIG=fedora-branched-compose-i386
-MAIL="devel at lists.fedoraproject.org,test at lists.fedoraproject.org"
+TOMAIL="devel at lists.fedoraproject.org test at lists.fedoraproject.org"
 SUBJECT='F-'$BRANCHED' Branched report: '$DATE' changes'
 FROM="Fedora Branched Report <rawhide at fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
@@ -26,9 +26,9 @@ TREEPREFIX="/mnt/koji/tree"
 EXPANDARCH="-$ARCH"
 DEPOPTS="--treename F-$BRANCHED --nomail"
 MASHOPTS="-c /etc/mash/mash.$ARCH.conf"
-MAIL="secondary at lists.fedoraproject.org,$ARCH at lists.fedoraproject.org"
+TOMAIL="secondary at lists.fedoraproject.org $ARCH at lists.fedoraproject.org"
 SUBJECT=$ARCH' F-'$BRANCHED' Branched report: '$DATE' changes'
-FROM=$ARCH' Fedora Branched Report <rawhide at fedoraproject.org>'
+FROM="${ARCH} Fedora Branched Report <rawhide at fedoraproject.org>"
 RSYNCPREFIX=""
 }
 
@@ -130,8 +130,10 @@ log "starting repodiff"
 mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "rm -f /var/lib/rpm/__db*"
 mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/bin/repodiff -s -q --new=file:///mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/source/SRPMS --old=file://$TREEPREFIX/development/$BRANCHED/source/SRPMS > $logdir/repodiff"
 log "finished repodiff"
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/share/mash/spam-o-matic $DEPOPTS /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH >$logdir/depcheck" &
 
+log "starting spam-o-matic"
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "/usr/share/mash/spam-o-matic $DEPOPTS /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH >$logdir/depcheck" &
+log "finished spam-o-matic"
 
 send_fedmsg start pungify.start
 
@@ -175,10 +177,12 @@ log "finished compose"
 
 send_fedmsg start rsync.start
 
+log "started compose sync"
 # data
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --link-dest=$TREEPREFIX/development/rawhide/ --exclude repodata/ /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/ $DESTPATH
 # repodata & cleanup
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --link-dest=$TREEPREFIX/development/rawhide/ --delete --delete-after /mnt/koji/mash/branched-$DATE/$BRANCHED$EXPANDARCH/ $DESTPATH
+log "finished compose sync"
 
 if [ "$?" = "0" ]; then
    export mail=0
@@ -188,7 +192,10 @@ send_fedmsg done rsync.complete
 
 log "starting sending email report"
 if [ "$mail" = "0" ]; then
-    cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish |  mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $MAIL
+    for tomail in "$(echo $TOMAIL)" ; do
+        cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish | \
+             mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+    done
 fi
 log "finished sending email report"
 
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 5b02815..3477b9a 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -28,7 +28,7 @@ DEPOPTS="--nomail"
 MASHOPTS="-c /etc/mash/mash.$ARCH.conf"
 TOMAIL="secondary at lists.fedoraproject.org $ARCH at lists.fedoraproject.org"
 SUBJECT=$ARCH' rawhide report: '$DATE' changes'
-FROM="$(echo $ARCH) Fedora Rawhide Report <rawhide at fedoraproject.org>"
+FROM="${ARCH} Fedora Rawhide Report <rawhide at fedoraproject.org>"
 RSYNCPREFIX=""
 }
 
@@ -169,12 +169,12 @@ log "finished compose"
 
 send_fedmsg start rsync.start
 
-log "started rawhide compose sync"
+log "started compose sync"
 # data
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --exclude repodata/ /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/ $DESTPATH
 # repodata & cleanup
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --delete --delete-after /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/ $DESTPATH
-log "finished rawhide compose sync"
+log "finished compose sync"
 
 if [ "$?" = "0" ]; then
    export mail=0
@@ -185,7 +185,8 @@ send_fedmsg done rsync.complete
 log "starting sending email report"
 if [ "$mail" = "0" ]; then
     for tomail in "$(echo $TOMAIL)" ; do
-         cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish | mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+        cat $logdir/start $logdir/depcheck $logdir/repodiff $logdir/finish | \
+             mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
     done
 fi
 log "finished sending email report"