diff options
| author | tv <tv> | 2005-01-21 13:24:13 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-01-21 13:24:13 +0000 |
| commit | 8829f3e644f83b31eaca51b134c1054815b3bba1 (patch) | |
| tree | cb28bd32323285828720916b88b710c84bb0daa7 /mk | |
| parent | 0e6c3d5c49d08313b32d6531e33caa90aca2bca5 (diff) | |
| download | pkgsrc-8829f3e644f83b31eaca51b134c1054815b3bba1.tar.gz | |
The pipe triggers a subshell even though () is not used. So use "exit" and
|| on the outside of the command to determine whether the packages found
in the loop are up to date.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 26c8aefed38..78b42fa46c2 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.72 2005/01/21 13:11:46 tv Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.73 2005/01/21 13:24:13 tv Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -225,21 +225,21 @@ bulk-check-uptodate: if [ "$$uptodate" = "1" ]; then \ ${SHCOMMENT} "Check required binary packages"; \ (${DEPENDS:C/:.*$//:@d@${ECHO} ${d:Q};@} ${TRUE}) | \ - while read dep; do \ - ${SHCOMMENT} "check against the binary pkg that pkg_add would pick, too:" ; \ - ${SHCOMMENT} "(Only one should be returned here, really...)" ; \ - pkg=`${PKG_ADMIN} lsbest "${PACKAGES}/All/$$dep"` ; \ + (while read dep; do \ + ${SHCOMMENT} "check against the binary pkg that pkg_add would pick, too:"; \ + ${SHCOMMENT} "(Only one should be returned here, really...)"; \ + pkg=`${PKG_ADMIN} lsbest "${PACKAGES}/All/$$dep"`; \ if [ -z "$$pkg" ]; then \ - ${ECHO_MSG} >&2 "BULK> Required binary package $$dep does not exist, rebuilding... " ; \ - uptodate=0; \ + ${ECHO_MSG} >&2 "BULK> Required binary package $$dep does not exist, rebuilding..."; \ + exit 1; \ elif [ "${USE_BULK_TIMESTAMPS}" = "yes" ] && [ -n "`${FIND} $$pkg -prune -newer ${REF} -print`" ]; then \ - ${ECHO_MSG} >&2 "BULK> Required binary package $$dep (`basename $$pkg`) is newer, rebuilding... " ; \ - uptodate=0; \ + ${ECHO_MSG} >&2 "BULK> Required binary package $$dep (`basename $$pkg`) is newer, rebuilding..."; \ + exit 1; \ else \ - ${ECHO_MSG} >&2 "BULK> Required binary package $$dep (`basename $$pkg`) is usable. " ; \ - fi ; \ - done ; \ - fi ; \ + ${ECHO_MSG} >&2 "BULK> Required binary package $$dep (`basename $$pkg`) is usable."; \ + fi; \ + done) || uptodate=0; \ + fi; \ ${ECHO_MSG} $$uptodate # rebuild binpkg if any of the pkg files is newer than the binary archive |