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

Make use of ERROR_CAT to print the list of conflicting packages.

Browse source
This commit is contained in:
jlam 2006-06-07 17:21:23 +00:00
parent 8001e36796
commit 732bc3967d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mk/flavor/pkg/install.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: install.mk,v 1.4 2006/06/07 17:09:52 ghen Exp $
# $NetBSD: install.mk,v 1.5 2006/06/07 17:21:23 jlam Exp $
######################################################################
### install-check-conflicts (PRIVATE, pkgsrc/mk/install/install.mk)
@ -20,8 +20,7 @@ install-check-conflicts:
${_PKG_SILENT}${_PKG_DEBUG} \
${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0; \
${ERROR_MSG} "${PKGNAME} conflicts with installed package(s):"; \
while read line; do ${ERROR_MSG} " $$line"; done \
< ${WRKDIR}/.CONFLICTS; \
${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e "s|^| |" | ${ERROR_CAT}; \
${ERROR_MSG} "They install the same files into the same place."; \
${ERROR_MSG} "Please remove conflicts first with pkg_delete(1)."; \
${RM} -f ${WRKDIR}/.CONFLICTS; \