diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-07 17:21:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-07 17:21:23 +0000 |
| commit | fbaba5c4e518d6b23d8e695e0eb850a3065d077e (patch) | |
| tree | bb3cb486edcab0f5e3f58f1628210a40e14d39e2 /mk/flavor | |
| parent | cba600a69f0982c5b8f851ca22acc0787941cbe2 (diff) | |
| download | pkgsrc-fbaba5c4e518d6b23d8e695e0eb850a3065d077e.tar.gz | |
Make use of ERROR_CAT to print the list of conflicting packages.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/install.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk index e6855429b6f..b2ead7eb6d4 100644 --- a/mk/flavor/pkg/install.mk +++ b/mk/flavor/pkg/install.mk @@ -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; \ |