diff options
| author | erh <erh@pkgsrc.org> | 2005-11-17 19:30:22 +0000 |
|---|---|---|
| committer | erh <erh@pkgsrc.org> | 2005-11-17 19:30:22 +0000 |
| commit | 60a3dc4c1b8dc4fa45f492a186cef716882c2ebc (patch) | |
| tree | b8608b13d2a39879da730057801c013f9cabf508 /mk | |
| parent | bbf29e2989c0bc8cadc865208affbfbb4c384390 (diff) | |
| download | pkgsrc-60a3dc4c1b8dc4fa45f492a186cef716882c2ebc.tar.gz | |
To support variants of make that run the shell so 'set -e' is true (shell
exits on any command failing), add a '|| ${TRUE}' when running the
check-vulnerable target in do-fetch.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 015af7cc70c..d0691b99dda 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1757 2005/11/17 17:18:01 erh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1758 2005/11/17 19:30:22 erh Exp $ # # This file is in the public domain. # @@ -1393,10 +1393,10 @@ do-fetch: ${_PKG_SILENT}${_PKG_DEBUG} \ if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then \ ${ECHO_MSG} "${_PKGSRC_IN}> Checking for vulnerabilities in ${PKGNAME}"; \ - vul=`${MAKE} ${MAKEFLAGS} check-vulnerable`; \ + vul=`${MAKE} ${MAKEFLAGS} check-vulnerable || ${TRUE}`; \ case "$$vul" in \ "") ;; \ - *vulnid:*) vulnids=`echo "$$vul" | grep vulnid: | sed -e's/.*vulnid:\\([[:digit:]]*\\).*/\\1/'`; \ + *vulnid:*) vulnids=`echo "$$vul" | ${GREP} vulnid: | ${SED} -e's/.*vulnid:\\([[:digit:]]*\\).*/\\1/'`; \ ${ECHO} "$$vul"; \ ${ECHO} "or if this package is absolutely essential, add this to mk.conf:"; \ for vulnid in $$vulnids ; do \ |