diff options
| author | tron <tron@pkgsrc.org> | 2008-05-26 14:21:43 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-05-26 14:21:43 +0000 |
| commit | 06c20fecf551ec0021dfdec9ddf7933bf08c137d (patch) | |
| tree | 122a1e829a5834bf51fd113ef382545bfd5b2819 /mk/flavor | |
| parent | 5ccc35b89b3bbcf2ccc1eb2d30a688a4196aee30 (diff) | |
| download | pkgsrc-06c20fecf551ec0021dfdec9ddf7933bf08c137d.tar.gz | |
Fix broken shell code:
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.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index c02c7e5f76a..eaaaf28f0eb 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -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 |