Changeset 228303d


Ignore:
Timestamp:
10/08/13 06:30:11 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
b5dbe14
Parents:
81bc3fc
Message:

Fix an issue with warden creating templates and not returning the
proper exit status.

While here also fix URL we pull FreeBSD distfiles from

Location:
src-sh/warden
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/warden/bin/warden

    re5240d6 r228303d  
    759759                    done 
    760760                    export TPLUGJAIL TNICK FBSDTAR FBSDARCH TRUEOSVER FBSDVER 
    761                     ${PROGDIR}/scripts/backend/createtemplate.sh ;; 
     761                    ${PROGDIR}/scripts/backend/createtemplate.sh ; exit $? ;; 
    762762            delete) delete_template "$3" ;; 
    763763              list) list_templates ;; 
  • src-sh/warden/scripts/backend/createtemplate.sh

    r7026ca1 r228303d  
    3434     for f in $DFILES 
    3535     do 
    36        fetch -o "${JDIR}/.download/$f" "ftp://ftp.freebsd.org/pub/FreeBSD/releases/${FBSDARCH}/${FBSDVER}/$f" 
     36       fetch -o "${JDIR}/.download/$f" "ftp://ftp.freebsd.org/pub/FreeBSD/releases/${FBSDARCH}/${FBSDARCH}/${FBSDVER}/$f" 
    3737       if [ $? -ne 0 ] ; then 
    3838         echo "Trying ftp-archive..." 
    39          fetch -o "${JDIR}/.download/$f" "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/${FBSDARCH}/${FBSDVER}/$f" 
     39         fetch -o "${JDIR}/.download/$f" "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/${FBSDARCH}/${FBSDARCH}/${FBSDVER}/$f" 
    4040         if [ $? -ne 0 ] ; then found=1 ; break; fi 
    4141       fi 
     
    208208# Check if we are on REAL old versions of FreeBSD 
    209209if [ -n "$FBSDVER" ] ; then 
    210   mV=`echo $FBSDVER | cut -d '.' -f 1` 
     210  mV=`echo $FBSDVER | cut -d '-' -f 1 | cut -d '.' -f 1` 
    211211  if [ $mV -lt 9 ] ; then  
    212212     oldFBSD="YES" 
Note: See TracChangeset for help on using the changeset viewer.