diff options
| author | wiz <wiz@pkgsrc.org> | 2009-02-08 23:16:08 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-02-08 23:16:08 +0000 |
| commit | f4d4d06ea10a4d450fcbe43059f7968679b7fab3 (patch) | |
| tree | f63b9ab321065f0b351a7d3f14261da55cf8f6e5 /mk | |
| parent | 677c83584caad2b43f32ae6047439b202e641d7f (diff) | |
| download | pkgsrc-f4d4d06ea10a4d450fcbe43059f7968679b7fab3.tar.gz | |
Break out of fetch loop if cd to _DISTDIR fails.
From Anon Ymous.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/fetch-list.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/fetch/fetch-list.mk b/mk/fetch/fetch-list.mk index de7241340b3..40aed739d89 100644 --- a/mk/fetch/fetch-list.mk +++ b/mk/fetch/fetch-list.mk @@ -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 @@ fetch-list-one-pkg: ${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 @@ fetch-list-one-pkg: ${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 |