[releng] Sync buildbranched/buildrawhide

[Till Maas]

commit d8c9d5f424af774735a9f0b52a375d943bc3ff23
Author: Till Maas <opensource at till.name>
Date:   Mon Nov 10 17:07:33 2014 +0100

    Sync buildbranched/buildrawhide

 scripts/buildbranched |   27 +++++++++++++++++----------
 scripts/buildrawhide  |   19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 12 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index 8ff6035..c9d954f 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -112,15 +112,17 @@ log "mock init"
 $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/${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/${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/${DIST}.$ARCH.mash"
-}
-
+if [[ "${DIST}" == "branched" ]]
+then
+    # 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/${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/${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/${DIST}.$ARCH.mash"
+    }
+fi
 # Copy in the hosts file so that we get the right address for koji
 log "mock setup /etc/hosts"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
@@ -136,7 +138,12 @@ send_fedmsg done mash.complete
 log "finished mash"
 log "starting hardlink"
 # hardlink the noarch deltarpms between x86_64 and i386 
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH"
+if [[ "${DIST}" == "branched" ]]
+then
+    $MOCK -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH"
+else
+    $MOCK -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH/*/os/drpms/"
+fi
 log "finished hardlink"
 
 log "starting repodiff"
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 8b4628f..25cecd8 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -112,6 +112,17 @@ log "mock init"
 $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
+if [[ "${DIST}" == "branched" ]]
+then
+    # 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/${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/${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/${DIST}.$ARCH.mash"
+    }
+fi
 # Copy in the hosts file so that we get the right address for koji
 log "mock setup /etc/hosts"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --copyin /etc/hosts /etc/hosts >/dev/null 2>&1 # this reports to fail, but actually works
@@ -127,7 +138,12 @@ send_fedmsg done mash.complete
 log "finished mash"
 log "starting hardlink"
 # hardlink the noarch deltarpms between x86_64 and i386 
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH/*/os/drpms/"
+if [[ "${DIST}" == "branched" ]]
+then
+    $MOCK -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH"
+else
+    $MOCK -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH/*/os/drpms/"
+fi
 log "finished hardlink"
 
 log "starting repodiff"
@@ -174,7 +190,6 @@ log "starting build_composeinfo"
 echo "Running build_composeinfo"
 ./scripts/build_composeinfo --name Fedora-${BRANCHED}-${DATE} /mnt/koji/mash/$DIST-$DATE/$BRANCHED/
 
-wait
 log "finished build_composeinfo"
 log "starting mock clean"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --clean