commit dad8e90b9c991922dc457d1d9d8d63740c72f5cc Author: Till Maas opensource@till.name Date: Tue Sep 30 22:33:03 2014 +0200
buildbranched/rawhide: Sync rsync code
scripts/buildbranched | 5 +++-- scripts/buildrawhide | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) --- diff --git a/scripts/buildbranched b/scripts/buildbranched index fe5e6ce..223df41 100755 --- a/scripts/buildbranched +++ b/scripts/buildbranched @@ -13,6 +13,7 @@ DIST=branched COMPSFILE="comps-f${BRANCHED}.xml"
TREEPREFIX="/pub/fedora/linux" +RSYNC_EXTRA_OPTS="--link-dest=$TREEPREFIX/development/rawhide/" MASHDIR="/mnt/koji/mash/${DIST}-$DATE" EXPANDARCH="" DEPOPTS="--treename F-$BRANCHED" @@ -181,9 +182,9 @@ send_fedmsg start rsync.start
log "started compose sync" # data -$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --link-dest=$TREEPREFIX/development/rawhide/ --exclude repodata/ ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH +$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --exclude repodata/ ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH # repodata & cleanup -$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --link-dest=$TREEPREFIX/development/rawhide/ --delete --delete-after ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH +$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --delete --delete-after ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH log "finished compose sync"
if [ "$?" = "0" ]; then diff --git a/scripts/buildrawhide b/scripts/buildrawhide index 9aa53e4..5364308 100755 --- a/scripts/buildrawhide +++ b/scripts/buildrawhide @@ -13,6 +13,7 @@ DIST=rawhide COMPSFILE=comps-rawhide.xml
TREEPREFIX="/pub/fedora/linux" +RSYNC_EXTRA_OPTS= MASHDIR="/mnt/koji/mash/${DIST}-$DATE" EXPANDARCH="" DEPOPTS="" @@ -116,7 +117,7 @@ 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}/rawhide$EXPANDARCH/*/os/drpms/" +mock -r $MOCKCONFIG --uniqueext=$DATE --chroot "hardlink -v -c ${MASHDIR}/$BRANCHED$EXPANDARCH/*/os/drpms/" log "finished hardlink"
log "starting repodiff" @@ -173,9 +174,9 @@ send_fedmsg start rsync.start
log "started compose sync" # data -$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --exclude repodata/ ${MASHDIR}/rawhide$EXPANDARCH/ $DESTPATH +$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --exclude repodata/ ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH # repodata & cleanup -$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --delete --delete-after ${MASHDIR}/rawhide$EXPANDARCH/ $DESTPATH +$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --delete --delete-after ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH log "finished compose sync"
if [ "$?" = "0" ]; then
rel-eng@lists.fedoraproject.org