diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-11 13:17:58 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-11 13:17:58 +0000 |
| commit | 8808ec4369efa24c092d8885057f6d8b5d635110 (patch) | |
| tree | 4648c8ac0f31931adc699ee26e8f49976d87c96f | |
| parent | 877eb6072cc10096332bbdcab32e2b65eabcbc50 (diff) | |
| download | pkgsrc-8808ec4369efa24c092d8885057f6d8b5d635110.tar.gz | |
- A warning is printed if there is no PKGNAME matching for a PKGPATH in the
.index file.
- Condensed the code for printing to another package's .broken file in case
of failure. (Added a variable pkg_brokenfile.)
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 32aac525b04..8c9b58d7f8a 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.95 2005/11/11 10:40:41 rillig Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.96 2005/11/11 13:17:58 rillig Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -427,28 +427,32 @@ bulk-package: tmp=`${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:[ ]*;;p" ${SUPPORTSFILE}` ; \ if test -n "$$tmp" ; then \ for pkgdir in $$tmp ; do \ + pkg_brokenfile=${PKGSRCDIR:Q}"/$$pkgdir/"${BROKENFILE:Q}; \ pkgname=`${AWK} '$$1 == "'"$$pkgdir"'" { print $$2; }' ${INDEXFILE}`; \ - if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \ + case $$pkgname in \ + "") pkgname="unknown"; \ + ${BULK_MSG} "WARNING: unknown pkgname in $$pkgdir.";; \ + esac; \ ${BULK_MSG} "marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\ pkgerr='-1'; pkgignore=''; pkgskip=''; \ if [ "${USE_BULK_BROKEN_CHECK}" = 'yes' ]; then \ pkgignore=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \ pkgskip=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \ fi; \ - if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f ${PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \ - ${BULK_MSG} "$$pkgname ($$pkgdir) may not be packaged because:" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ - ${BULK_MSG} "$$pkgignore" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ - ${BULK_MSG} "$$pkgskip" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ + if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f "$${pkg_brokenfile}" ]; then \ + { ${BULK_MSG} "$$pkgname ($$pkgdir) may not be packaged because:"; \ + ${BULK_MSG} "$$pkgignore"; \ + ${BULK_MSG} "$$pkgskip"; \ + } >> "${pkg_brokenfile}"; \ if [ "${USE_BULK_BROKEN_CHECK}" != 'yes' ] || [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \ pkgerr="0"; \ else \ pkgerr="1"; \ fi; \ fi; \ - ${BULK_MSG} "$$pkgname ($$pkgdir) is broken because it depends upon ${PKGNAME} (${PKGPATH}) which is broken." \ - >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ - ${ECHO_MSG} "Please view the <a href=\"../../${PKGPATH}/${BROKENFILE}\">build log for ${PKGNAME}</a>.<br />" \ - >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ + { ${BULK_MSG} "$$pkgname ($$pkgdir) is broken because it depends upon ${PKGNAME} (${PKGPATH}) which is broken."; \ + ${ECHO} "Please view the <a href=\"../../${PKGPATH}/${BROKENFILE}\">build log for ${PKGNAME}</a>.<br />"; \ + } >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE}; \ nbrokenby=`expr $$nbrokenby + 1`;\ if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${PKGSRCDIR}/${BROKENFILE} ; then :; else \ ${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${PKGSRCDIR}/${BROKENFILE} ;\ |