kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix broken shell code:

Browse source 
You must *not* use "test ... && ..." when you use "set -e". Because if the
first expression fails your shell script will abort.

This should fix problem with NetBSD-current's (correctly behaving)
"/bin/sh" report on current-users by David Holland and Kurt Schreiner.
This commit is contained in:
tron 2008-05-26 14:21:43 +00:00
parent 5ccc35b89b
commit 06c20fecf5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mk/flavor/pkg/depends.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: depends.mk,v 1.42 2008/04/03 14:07:51 joerg Exp $
# $NetBSD: depends.mk,v 1.43 2008/05/26 14:21:43 tron Exp $
# This command prints out the dependency patterns for all full (run-time)
# dependencies of the package.
@ -122,7 +122,7 @@ _flavor-install-dependencies: .PHONY ${_DEPENDS_FILE}
exec 3<&0; \
${CAT} ${_DEPENDS_FILE} | \
while read type pattern dir; do \
${TEST} "$$type" = "bootstrap" && continue; \
${TEST} "$$type" != "bootstrap" || continue; \
${_DEPENDS_INSTALL_CMD} 0<&3; \
done
@ -167,7 +167,7 @@ bootstrap-depends: ${_BOOTSTRAP_DEPENDS_TARGETS}
_flavor-bootstrap-depends:
${RUN}${_LIST_DEPENDS_CMD.bootstrap} | \
while read type pattern dir; do \
${TEST} "$$type" != "bootstrap" && continue; \
${TEST} "$$type" = "bootstrap" || continue; \
${_DEPENDS_INSTALL_CMD}; \
done