From 1208dc6516f5d6e944d80d30b9f2a0c755a39f14 Mon Sep 17 00:00:00 2001 From: thierry Date: Mon, 12 Nov 2007 05:52:11 +0000 Subject: [PATCH] fix -devel.lst extraction --- scripts/nightly-build-vserver.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/scripts/nightly-build-vserver.sh b/scripts/nightly-build-vserver.sh index 2ab5312..2a4bef5 100755 --- a/scripts/nightly-build-vserver.sh +++ b/scripts/nightly-build-vserver.sh @@ -236,12 +236,25 @@ function main () { exec > $LOG 2>&1 echo "XXXXXXXXXX $COMMAND: creating vserver $BASE" $(date) show_env + ### extract vbuild-init-vserver.sh and run it svn cat $SVNPATH/vbuild-init-vserver.sh > /tmp/vbuild-init-vserver-$$ + # get -devel.lst set +e - svn cat $SVNPATH/${PLDISTRO}-devel-${FCDISTRO}.lst > /tmp/${PLDISTRO}-devel-${FCDISTRO}.lst - svn cat $SVNPATH/${PLDISTRO}-devel.lst > /tmp/${PLDISTRO}-devel.lst + svn cat $SVNPATH/${PLDISTRO}-devel-${FCDISTRO}.lst > /tmp/devel-$$.lst + if [ "$?" = 0 ] ; then + mv /tmp/devel-$$.lst /tmp/${PLDISTRO}-devel-${FCDISTRO}.lst + else + svn cat $SVNPATH/${PLDISTRO}-devel.lst > /tmp/devel-$$.lst + if [ "$?" = 0 ] ; then + mv /tmp/devel-$$.lst /tmp/${PLDISTRO}-devel.lst + else + echo "$COMMAND: Cannot locate ${PLDISTRO}-devel.lst" + failure + fi + fi set -e + # Create vserver cd /tmp chmod +x vbuild-init-vserver-$$ @@ -256,6 +269,7 @@ function main () { echo "==================== See next stages in $LOG2" >> $LOG # redirect log again exec >> $LOG2 2>&1 + LOG=$LOG2 echo "XXXXXXXXXX $COMMAND: preparation of vserver $BASE done" $(date) cp $COMMANDPATH /vservers/${BASE}/ -- 2.43.0