[releng] buildbranched: Use $DIST for mash config edit

Till Maas till at fedoraproject.org
Tue Sep 30 20:58:08 UTC 2014


commit 60bea5416517c0da50a63afade42898e8d76eb09
Author: Till Maas <opensource at till.name>
Date:   Tue Sep 30 22:58:38 2014 +0200

    buildbranched: Use $DIST for mash config edit

 scripts/buildbranched |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index a66369f..b1d9704 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -103,12 +103,12 @@ mock -r $MOCKCONFIG --uniqueext=$DATE --init
 log "mock install base packages"
 mock -r $MOCKCONFIG --uniqueext=$DATE --no-clean --install koji yum createrepo cvs make intltool findutils mash yum-utils rsync repoview hardlink
 # until we move to bodhi lets not be strict about the gpg keys
-mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|strict_keys = True|strict_keys = False|g' /etc/mash/branched.mash"
+mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|strict_keys = True|strict_keys = False|g' /etc/mash/${DIST}.mash"
 #disable delta close to release as we do not want them in the final trees
-mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|delta = True|delta = False|g' /etc/mash/branched.mash"
+mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|delta = True|delta = False|g' /etc/mash/${DIST}.mash"
 # secondary arches are a bit harder to make sure everything is signed lets not be too strict, but actual release compsoes need to be.
 [ -n "$ARCH" ] && {
-mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|strict_keys = True|strict_keys = False|g' /etc/mash/branched.$ARCH.mash"
+mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "sed -i -e 's|strict_keys = True|strict_keys = False|g' /etc/mash/${DIST}.$ARCH.mash"
 }
 
 # Copy in the hosts file so that we get the right address for koji


More information about the rel-eng mailing list