kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reverted my last change. I was completely wrong. The real fault reported

Browse source 
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.
This commit is contained in:
rillig 2008-01-29 19:18:26 +00:00
parent 1b87d175f8
commit 93cc59aaae
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mk/pkginstall/bsd.pkginstall.mk
View file

@ -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}: