[pkgsrc/trunk]: pkgsrc/mk/bulk The pipe triggers a subshell even though () is...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c1e8789451b
branches:  trunk
changeset: 487873:0c1e8789451b
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Jan 21 13:24:13 2005 +0000

description:
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:

 mk/bulk/bsd.bulk-pkg.mk |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (43 lines):

diff -r 98e77e82326f -r 0c1e8789451b mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Fri Jan 21 13:11:46 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Fri Jan 21 13:24:13 2005 +0000
@@ -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@localhost>
@@ -225,21 +225,21 @@
        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