diff options
| author | dmcmahill <dmcmahill> | 2003-02-13 22:51:03 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2003-02-13 22:51:03 +0000 |
| commit | 95dce4486ef99b675dc0196e30f81bebb7fc17c5 (patch) | |
| tree | 7e0cbc95a97b1a8318832dcefd8b357b7ae4ef75 /mk/bulk | |
| parent | f2fc3f181f1f20e1af3844fe2a7253cdf14d7d5b (diff) | |
| download | pkgsrc-95dce4486ef99b675dc0196e30f81bebb7fc17c5.tar.gz | |
correct the 'broken due to depends' processing. This change makes the
summary email list correctly the packages which are broken because of
their dependencies. Problem noted on Huberts most recent bulk build.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 1989eca64c6..6662d0573bb 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.42 2003/02/08 23:27:00 kei Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.43 2003/02/13 22:51:03 dmcmahill Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -324,10 +324,12 @@ bulk-package: if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \ ${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\ pkgerr="-1"; \ - pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && (${MAKE} show-var VARNAME=PKG_FAIL_REASON; ${MAKE} show-var VARNAME=PKG_SKIP_REASON))`; \ - if [ ! -z "$$pkgignore" -a ! -f ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \ + pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \ + pkgskip=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \ + if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \ ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ ${ECHO_MSG} "BULK> $$pkgignore" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ + ${ECHO_MSG} "BULK> $$pkgskip" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ if [ -z "`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \ pkgerr="0"; \ else \ |