diff options
| author | rillig <rillig@pkgsrc.org> | 2007-05-23 10:50:44 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-05-23 10:50:44 +0000 |
| commit | 4a63eaf9f3756e194f9f9fff5b132bacb676a4e4 (patch) | |
| tree | ca0ceb3e246c66e7f1092de3aea52297f2b0b3e2 /mk/bulk | |
| parent | 3f5d894b4d74833fb151580a9b910fb5f4ac26a9 (diff) | |
| download | pkgsrc-4a63eaf9f3756e194f9f9fff5b132bacb676a4e4.tar.gz | |
When removing an already installed package, the correct package version
is reported.
Fixed the output by not nestedly redirecting the output of "bmake debug".
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 272c7dbf85c..a7589d42ae6 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.141 2007/05/19 14:10:35 wiz Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.142 2007/05/23 10:50:44 rillig Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -363,7 +363,8 @@ bulk-package: } 2>&1 | ${TEE} -a ${_BUILDLOG:Q}; \ else \ ( if ${PKG_INFO} -qe ${PKGWILDCARD:Q}; then \ - ${BULK_MSG} "Removing outdated (installed) package ${PKGNAME} first." ; \ + oldpkg=`${PKG_INFO} -e ${PKGWILDCARD}`; \ + ${BULK_MSG} "Removing outdated (installed) package $$oldpkg first." ; \ ${DO} ${PKG_DELETE} -r ${PKGWILDCARD:Q} ;\ fi ; \ if [ -f ${PKGFILE} ]; then \ @@ -456,7 +457,7 @@ bulk-package: ${ECHO} "<body>"; \ ${ECHO} "<pre>"; \ ${TO_HTML} < ${_BUILDLOG:Q}; \ - ${MAKE} debug 2>&1 | ${TO_HTML} >> ${_BROKENFILE:Q} ; \ + ${MAKE} debug 2>&1 | ${TO_HTML}; \ ${ECHO} "</pre>"; \ } > ${_BROKENFILE:Q}; \ ${RM} -f ${_BUILDLOG:Q}; \ |