commit 184b89d0d3c394a110174172ece5f412dfbcbcd6
Author: Till Maas <opensource(a)till.name>
Date: Tue Sep 30 22:13:13 2014 +0200
buildbranched/rawhide: Reduce duplication
scripts/buildbranched | 10 +++++-----
scripts/buildrawhide | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 0c3b5a7..fe5e6ce 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -17,7 +17,7 @@ MASHDIR="/mnt/koji/mash/${DIST}-$DATE"
EXPANDARCH=""
DEPOPTS="--treename F-$BRANCHED"
MASHOPTS=""
-MOCKCONFIG=fedora-branched-compose-i386
+MOCKCONFIG="fedora-${DIST}-compose-i386"
TOMAIL="devel(a)lists.fedoraproject.org test(a)lists.fedoraproject.org"
SUBJECT='F-'$BRANCHED' Branched report: '$DATE' changes'
FROM="Fedora Branched Report <rawhide(a)fedoraproject.org>"
@@ -25,16 +25,16 @@ RSYNCPREFIX="sudo -u ftpsync"
[ -n "$ARCH" ] && {
TREEPREFIX="/mnt/koji/tree"
EXPANDARCH="-$ARCH"
-DEPOPTS="--treename F-$BRANCHED --nomail"
+DEPOPTS="%{DEPOPTS} --nomail"
MASHOPTS="-c /etc/mash/mash.$ARCH.conf"
TOMAIL="secondary(a)lists.fedoraproject.org $ARCH(a)lists.fedoraproject.org"
-SUBJECT=$ARCH' F-'$BRANCHED' Branched report: '$DATE' changes'
-FROM="${ARCH} Fedora Branched Report <rawhide(a)fedoraproject.org>"
+SUBJECT="${ARCH} ${SUBJECT}"
+FROM="${ARCH} ${FROM}"
RSYNCPREFIX=""
}
[ "$ARCH" == "ppc" ] && {
-MOCKCONFIG=fedora-branched-compose-ppc64
+MOCKCONFIG="fedora-${DIST}-compose-ppc64"
}
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 50bfc00..9aa53e4 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -17,7 +17,7 @@ MASHDIR="/mnt/koji/mash/${DIST}-$DATE"
EXPANDARCH=""
DEPOPTS=""
MASHOPTS=""
-MOCKCONFIG=fedora-rawhide-compose-i386
+MOCKCONFIG="fedora-${DIST}-compose-i386"
TOMAIL="devel(a)lists.fedoraproject.org test(a)lists.fedoraproject.org"
SUBJECT='rawhide report: '$DATE' changes'
FROM="Fedora Rawhide Report <rawhide(a)fedoraproject.org>"
@@ -25,16 +25,16 @@ RSYNCPREFIX="sudo -u ftpsync"
[ -n "$ARCH" ] && {
TREEPREFIX="/mnt/koji/tree"
EXPANDARCH="-$ARCH"
-DEPOPTS="--nomail"
+DEPOPTS="%{DEPOPTS} --nomail"
MASHOPTS="-c /etc/mash/mash.$ARCH.conf"
TOMAIL="secondary(a)lists.fedoraproject.org $ARCH(a)lists.fedoraproject.org"
-SUBJECT=$ARCH' rawhide report: '$DATE' changes'
-FROM="${ARCH} Fedora Rawhide Report <rawhide(a)fedoraproject.org>"
+SUBJECT="${ARCH} ${SUBJECT}"
+FROM="${ARCH} ${FROM}"
RSYNCPREFIX=""
}
[ "$ARCH" == "ppc" ] && {
-MOCKCONFIG=fedora-rawhide-compose-ppc64
+MOCKCONFIG="fedora-${DIST}-compose-ppc64"
}
Show replies by date