diff options
| author | rillig <rillig@pkgsrc.org> | 2008-01-29 19:18:26 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-01-29 19:18:26 +0000 |
| commit | 93cc59aaae88591f718d1bc4daaa80950033f350 (patch) | |
| tree | 254bec7604d32a404478971da300603538e7e949 /mk/pkginstall | |
| parent | 1b87d175f8ab5c62404b69c78d7047a7b05f39d5 (diff) | |
| download | pkgsrc-93cc59aaae88591f718d1bc4daaa80950033f350.tar.gz | |
Reverted my last change. I was completely wrong. The real fault reported
in PR 37905 is exactly what I wanted to prevent using this check: A
configuration file was mentioned via CONF_FILES but does not exist in
the PLIST.
Diffstat (limited to 'mk/pkginstall')
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 0e610b0906b..236745ac62b 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.41 2008/01/29 19:14:45 rillig Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.42 2008/01/29 19:18:26 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -451,7 +451,6 @@ _INSTALL_FILES_DATAFILE= ${_PKGINSTALL_DIR}/files-data _INSTALL_UNPACK_TMPL+= ${_INSTALL_FILES_FILE} _INSTALL_DATA_TMPL+= ${_INSTALL_FILES_DATAFILE} -# XXX: These checks should be run _after_ ./+INSTALL privileged-install-hook: _pkginstall-postinstall-check _pkginstall-postinstall-check: .PHONY ${RUN} p="${DESTDIR}${PREFIX}"; \ @@ -461,31 +460,31 @@ _pkginstall-postinstall-check: .PHONY set args ${RCD_SCRIPTS}; shift; \ while [ $$# -gt 0 ]; do \ egfile=`canon "${RCD_SCRIPTS_EXAMPLEDIR}/$$1"`; shift; \ - : [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "RCD_SCRIPT $$egfile does not exist."; \ + [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "RCD_SCRIPT $$egfile does not exist."; \ done; \ set args ${CONF_FILES}; shift; \ while [ $$# -gt 0 ]; do \ needargs CONF_FILES 2 $$# "$$*"; \ egfile=`canon "$$1"`; shift 2; \ - : [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILE $$egfile does not exist."; \ + [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILE $$egfile does not exist."; \ done; \ set args ${REQD_FILES}; shift; \ while [ $$# -gt 0 ]; do \ needargs REDQ_FILES 2 $$# "$$*"; \ egfile=`canon "$$1"`; shift 2; \ - : [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILE $$egfile does not exist."; \ + [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILE $$egfile does not exist."; \ done; \ set args ${CONF_FILES_PERMS}; shift; \ while [ $$# -gt 0 ]; do \ needargs CONF_FILES_PERMS 5 $$# "$$*"; \ egfile=`canon "$$1"`; shift 5; \ - : [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist."; \ + [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist."; \ done; \ set args ${REQD_FILES_PERMS}; shift; \ while [ $$# -gt 0 ]; do \ needargs REQD_FILES_PERMS 5 $$# "$$*"; \ egfile=`canon "$$1"`; shift 5; \ - : [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist."; \ + [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist."; \ done ${_INSTALL_FILES_DATAFILE}: |