[pkgsrc/trunk]: pkgsrc/mk/fetch Break out of fetch loop if cd to _DISTDIR fails.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fd3cccc8562
branches:  trunk
changeset: 554119:0fd3cccc8562
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 08 23:16:08 2009 +0000

description:
Break out of fetch loop if cd to _DISTDIR fails.
>From Anon Ymous.

diffstat:

 mk/fetch/fetch-list.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r b4ff160d512e -r 0fd3cccc8562 mk/fetch/fetch-list.mk
--- a/mk/fetch/fetch-list.mk    Sun Feb 08 23:14:14 2009 +0000
+++ b/mk/fetch/fetch-list.mk    Sun Feb 08 23:16:08 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch-list.mk,v 1.9 2006/07/27 21:46:46 jlam Exp $
+# $NetBSD: fetch-list.mk,v 1.10 2009/02/08 23:16:08 wiz Exp $
 
 ######################################################################
 ### fetch-list (PUBLIC)
@@ -80,11 +80,11 @@
                ${ECHO} 'unsorted_sites="$${unsorted_sites} ${_MASTER_SITE_BACKUP}"'; \
                ${ECHO} sites='"'${_ORDERED_SITES:Q}'"';                \
                ${ECHO} "${MKDIR} ${_DISTDIR}";                         \
-               ${ECHO} 'cd ${_DISTDIR} && [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
+               ${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
                ${ECHO} 'for site in $$sites; do';                      \
                ${ECHO} '       ${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
                ${ECHO} '       ${ECHO} ${fetchfile:T} not fetched';    \
-               ${ECHO} done;                                           \
+               ${ECHO} 'done; }';                                      \
                ${ECHO} ')';                                            \
        fi)
 .    else
@@ -98,11 +98,11 @@
                ${ECHO} 'unsorted_sites="${SITES.${fetchfile:T:S/=/--/}} ${_MASTER_SITE_BACKUP}"'; \
                ${ECHO} sites='"'${_ORDERED_SITES:Q}'"';                \
                ${ECHO} "${MKDIR} ${_DISTDIR}";                         \
-               ${ECHO} 'cd ${_DISTDIR} && [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
+               ${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
                ${ECHO} 'for site in $$sites; do';                      \
                ${ECHO} '       ${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
                ${ECHO} '       ${ECHO} ${fetchfile:T} not fetched';    \
-               ${ECHO} done;                                           \
+               ${ECHO} 'done; }';                                      \
        fi)
 .    endif
 .  endfor