[releng] buildbranched/rawhide: Fix mash calls

Till Maas till at fedoraproject.org
Wed Oct 1 19:21:51 UTC 2014


commit 272926406145042b3e3b62f785fec02b2482549e
Author: Till Maas <opensource at till.name>
Date:   Wed Oct 1 21:22:36 2014 +0200

    buildbranched/rawhide: Fix mash calls

 scripts/buildbranched |    3 +--
 scripts/buildrawhide  |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index b1d9704..fd6ef49 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -119,8 +119,7 @@ send_fedmsg start mash.start
 
 log "starting mash"
 # Drop privs here so that we run as the masher UID
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/"${COMPSFILE}" $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
-    "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/${COMPSFILE} $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/${COMPSFILE} $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
 
 send_fedmsg done mash.complete
 
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 0de0d6c..31c789f 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -110,8 +110,7 @@ send_fedmsg start mash.start
 
 log "starting mash"
 # Drop privs here so that we run as the masher UID
-mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/"${COMPSFILE}" $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
-    "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/${COMPSFILE} $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
+mock -r $MOCKCONFIG --uniqueext=$DATE --unpriv --chroot "mash $MASHOPTS -p $TREEPREFIX/development/$BRANCHED -o ${MASHDIR} --compsfile $logdir/${COMPSFILE} $BRANCHED$EXPANDARCH > $logdir/mash.log 2>&1" || exit 1
 
 send_fedmsg done mash.complete
 


More information about the rel-eng mailing list