Thu Jul 9 20:10:39 2009 UTC ()

Pullup ticket #2804 - by he
mk/bulk/build: robustness improvement

Revisions pulled up:
- mk/bulk/build			1.106
---
Module Name:	pkgsrc
Committed By:	he
Date:		Thu Jul  9 12:46:50 UTC 2009

Modified Files:
	pkgsrc/mk/bulk: build

Log Message:
With the most recent pkg_install, directories are removed when the
last file in a directory is removed.  This might cause common and
expected-to-be-existing directories in /usr/pkg to be removed, and
a subsequent attempt at installing a file to the now non-existent
directory will instead create a file with the name of the expected
directory.

This will create PLIST errors for the package in question, but also will
cause the erroneously named file to not be removed on package removal.

This can cause cascading bulk build failures for subsequent packages.
To prevent this, after each package is done, check if some of the
common top-level expected-to-be directories are now files, and
remove them and emit an error message if so.

I *think* I already fixed the single package which had the unfortunate
problem of not declaring "include" as an installation directory, but
this should prevent the problem from re-occurring in the future as well.

Thanks to joerg@ for the hint for pulling in the value of PREFIX.


(tron)

diff -r1.105 -r1.105.14.1 pkgsrc/mk/bulk/build

--- pkgsrc/mk/bulk/Attic/build 2008/06/13 21:52:16 1.105
+++ pkgsrc/mk/bulk/Attic/build 2009/07/09 20:10:39 1.105.14.1

 @@ -1,15 +1,15 @@
 #!/bin/sh
-# $NetBSD: build,v 1.105 2008/06/13 21:52:16 sketch Exp $
+# $NetBSD: build,v 1.105.14.1 2009/07/09 20:10:39 tron Exp $
+#
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 @@ -250,26 +250,27 @@ run_pre_build () {
 # Load pkgsrc variables that affect the build process.
 load_vars () {
 	echo "+----------------------------------------+"
 	echo "| Some variables used in the bulk build: |"
 	echo "+----------------------------------------+"
 	vars="	OPSYS OS_VERSION MACHINE_ARCH
 		BULK_PREREQ
 		BULKFILESDIR
 		BULK_DBFILE DEPENDSFILE INDEXFILE ORDERFILE STARTFILE
 		SUPPORTSFILE BULK_BUILD_ID_FILE BUILDLOG BROKENFILE
 		BROKENWRKLOG
 		PREFIX
 		AWK GREP MAIL_CMD MKDIR PAX PERL5 SED
 		PKG_DELETE PKG_INFO PKGBASE"
 	values=`cd "$lintpkgsrc_dir" && $BMAKE show-vars VARNAMES="$vars" USE_TOOLS="awk grep mail mkdir pax perl sed"`
 	for v in $vars; do
 		eval "read $v" || die "Could not read value for $v"
 		eval "value=\$$v"
 		if [ "$v" != "BULK_PREREQ" ] && [ ! "$value" ]; then
 			die "$v must not be empty."
 		fi
 		printf "%-15s = %s\\n" "$v" "$value"
 	done <<EOF
 @@ -323,32 +324,42 @@ do_real_bulk_build () {
 	do
 		if ${GREP} -q "^${pkgdir}\$" "${main_buildlog}"; then
 			: "skip this package"
 		else
 			percent=`${AWK} -v tot="${tot}" '
 				END {
 					printf("%d/%d=%4.1f%%", NR, tot, NR*100/tot);
 				}' "${main_buildlog}"`
 			( cd "${pkgsrc_dir}/${pkgdir}" \
 			  && ${NICE_LEVEL} ${BMAKE} USE_BULK_CACHE=yes "${target}" \
 				$makeargs </dev/null | post_filter_cmd
 			) || true
 			echo "$pkgdir" >> "${main_buildlog}"
 			check_pkg_dirs
 		fi
 	done
 	echo "build> Build finished."
+}
 check_pkg_dirs () {
 	for d in bin etc include info lib libexec man sbin share; do
 		if [ -f $PREFIX/$d ]; then
 			echo "Removing file, should be dir: $PREFIX/$d" >&2
 			rm -f $PREFIX/$d
 		fi
 	done
+}
 # clean up installed packages left over
 do_bulk_cleanup () {
 	echo "build> Removing all installed packages left over from build..."
 	for pkgname in `${PKG_INFO} -e \*`
 	do
 		if ${PKG_INFO} -qe "${pkgname}"; then
 			pkgdir=`${AWK} '$2 == "'"$pkgname"'" { print $1; }' "$INDEXFILE"`
 			case "${BULK_PREREQ}" in
 				*"${pkgdir}"* )
 					echo "build> Keeping BULK_PREREQ: $pkgname ($pkgdir)" ;
 					;;
 				* )