pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/bulk When removing an already installed package, th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8364d5832b35
branches: trunk
changeset: 529035:8364d5832b35
user: rillig <rillig%pkgsrc.org@localhost>
date: Wed May 23 10:50:44 2007 +0000
description:
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:
mk/bulk/bsd.bulk-pkg.mk | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (28 lines):
diff -r 609c6c6d7d09 -r 8364d5832b35 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk Wed May 23 10:44:17 2007 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk Wed May 23 10:50:44 2007 +0000
@@ -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@localhost>
@@ -363,7 +363,8 @@
} 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 @@
${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}; \
Home |
Main Index |
Thread Index |
Old Index