diff options
| author | rillig <rillig@pkgsrc.org> | 2007-01-06 19:53:01 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-01-06 19:53:01 +0000 |
| commit | b51c2d32b349cede29322f6165222a1f87c4f61b (patch) | |
| tree | 501097fb17de71aa89595a0dc72ec47c16df84e0 | |
| parent | d037715fbc9842bd53b02d996d50534178f24f1b (diff) | |
| download | pkgsrc-b51c2d32b349cede29322f6165222a1f87c4f61b.tar.gz | |
Added the FAIL command, which can be prepended to an arbitrary shell
command, making it return with a non-zero exit status.
The first use of it is in a command called FAIL_MSG, which prints an
error message and exits immediately. ERROR_MSG itself doesn't do that.
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/scripts/fail | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 31a4ed42fc7..f60aebb50c3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1903 2007/01/02 23:34:40 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1904 2007/01/06 19:53:01 rillig Exp $ # # This file is in the public domain. # @@ -371,6 +371,7 @@ PHASE_MSG?= ${ECHO_MSG} ${_PKGSRC_IN:Q}\> STEP_MSG?= ${ECHO_MSG} "=>" WARNING_MSG?= ${ECHO_MSG} 1>&2 "WARNING:" ERROR_MSG?= ${ECHO_MSG} 1>&2 "ERROR:" +FAIL_MSG?= ${FAIL} ${ERROR_MSG} WARNING_CAT?= ${SED} -e "s|^|WARNING: |" 1>&2 ERROR_CAT?= ${SED} -e "s|^|ERROR: |" 1>&2 @@ -379,6 +380,10 @@ ERROR_CAT?= ${SED} -e "s|^|ERROR: |" 1>&2 # do something. DO_NADA?= ${TRUE} +# the FAIL command executes its arguments and then exits with a non-zero +# status. +FAIL?= ${SH} ${PKGSRCDIR}/mk/scripts/fail + # # Config file related settings - see doc/pkgsrc.txt # diff --git a/mk/scripts/fail b/mk/scripts/fail new file mode 100644 index 00000000000..af1e364c614 --- /dev/null +++ b/mk/scripts/fail @@ -0,0 +1,5 @@ +#! /bin/sh +# $NetBSD: fail,v 1.1 2007/01/06 19:53:01 rillig Exp $ + +"$@" +exit 1 |