diff options
| author | rillig <rillig> | 2006-07-05 23:27:34 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-07-05 23:27:34 +0000 |
| commit | cb0acd23763ce0a4d97b555c9e8981636d67445e (patch) | |
| tree | 34b0ebf89cb0535c706fd324f26a01ec957724ca /mk | |
| parent | 339c6c53934769c0df1a7f699a8aa5e1b5f9118a (diff) | |
| download | pkgsrc-cb0acd23763ce0a4d97b555c9e8981636d67445e.tar.gz | |
Fixed the test on PKG_{FAIL,SKIP}_REASON. Added a prefix line to the
output of PKG_SKIP_REASON, since the plain message does not say where it
comes from.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 493297c8635..ce9a981da3e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1859 2006/07/05 22:21:02 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1860 2006/07/05 23:27:34 rillig Exp $ # # This file is in the public domain. # @@ -602,14 +602,19 @@ update depends do-check-pkg-fail-or-skip-reason: . if defined(SKIP_SILENT) @${DO_NADA} . else +. if defined(PKG_FAIL_REASON) && !empty(PKG_FAIL_REASON:M*) @for str in ${PKG_FAIL_REASON}; do \ ${ERROR_MSG} "$$str"; \ done - @for str in ${PKG_SKIP_REASON}; do \ +. endif +. if defined(PKG_SKIP_REASON) && !empty(PKG_SKIP_REASON:M*) + @${WARNING_MSG} "Skipping ${PKGNAME}:"; \ + for str in ${PKG_SKIP_REASON}; do \ ${WARNING_MSG} "$$str"; \ done +. endif . endif -. if defined(PKG_FAIL_REASON) +. if defined(PKG_FAIL_REASON) && !empty(PKG_FAIL_REASON:M*) @${FALSE} . endif . endif # SKIP |