pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/bulk report correct pkgcount by first cd'ing to PKG...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffa84f0aac9b
branches:  trunk
changeset: 522459:ffa84f0aac9b
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sat Dec 09 19:56:54 2006 +0000

description:
report correct pkgcount by first cd'ing to PKGDB_DIR, then FINDing in there.
(else -prune will cause us to return immediately, always reporting 1 installed
package even if we have more)

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r ee5aa3c37685 -r ffa84f0aac9b mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Sat Dec 09 19:43:40 2006 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Sat Dec 09 19:56:54 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.127 2006/12/09 19:40:53 jschauma Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.128 2006/12/09 19:56:54 jschauma Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -351,7 +351,7 @@
                ${ECHO} '###' ; \
                ${ECHO} '###' `date`: ; \
                ${ECHO} '### ${MAKE} ${.TARGET} for ${PKGNAME}' ; \
-               ${ECHO} '### Current pkg count: ' `${FIND} ${PKG_DBDIR} -type d ! -name '.' -prune -print | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
+               ${ECHO} '### Current pkg count: ' `cd ${PKG_DBDIR} && ${FIND} . -type d ! -name '.' -prune -print | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
                ${ECHO} '###' ; \
        fi \
        ) 2>&1 | ${TEE} -a ${_BUILDLOG:Q}



Home | Main Index | Thread Index | Old Index