Sat Feb 27 12:00:54 2010 UTC ()

delete the summary and cache files in case the dir is writeable, but the
file isn't (as suggested by bouyer@)
fix typo in output message


(spz)

diff -r1.17 -r1.18 pkgsrc/mk/scripts/binpkg-cache

--- pkgsrc/mk/scripts/binpkg-cache 2007/10/13 17:46:12 1.17
+++ pkgsrc/mk/scripts/binpkg-cache 2010/02/27 12:00:54 1.18

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: binpkg-cache,v 1.17 2007/10/13 17:46:12 rillig Exp $
+# $NetBSD: binpkg-cache,v 1.18 2010/02/27 12:00:54 spz Exp $
+#
 # Script for generating a cache file with information about
 # all binary packages contained in a directory.
+#
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Dan McMahill.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 @@ -196,27 +196,27 @@ process_binpkg_dir(){
 			echo "${tab}Invalid version cache file.  ${d}/${cachefile} will be regenerated."
 			echo "Need version ${cacheversion} but the file has"
 			${GREP} "^pkgcache_version " ${d}/${cachefile}
 		else
 			echo "${tab}Cache file ${d}/${cachefile} is up to date."
 		fi
 	fi
 	if test "${build_summary}" = "yes" -a ! -f ${d}/${summaryfile}.gz ; then
 		echo "${tab}Summary file ${d}/${summaryfile}.gz is missing and will be created."
 		need_update=yes
 	fi
 	if test "${build_summary}" = "yes" -a ${d}/${summaryfile}.gz -ot ${d}/${cachefile} ; then
-		echo "${tab}Summary file ${d}/${summaryfile}.gz is out of date and will be regnerated."
+		echo "${tab}Summary file ${d}/${summaryfile}.gz is out of date and will be regenerated."
 		need_update=yes
 	fi
 	# FIX_ME
 	# We should use stale_entries in a way where we only update the
 	# cache file entries corresponding to these if we're rebuilding
 	# due to stale entries.  That should save a good bit of time.
+	#
 	if test "X${need_update}" = "Xyes" ; then
 		echo "pkgcache_version ${cacheversion}" > ${tmpd}/${cachefile}
 		rm -f ${tmpd}/${summaryfile}
 		touch ${tmpd}/${summaryfile}
 		for f in ${d}/*${PKG_SUFX} ; do
 @@ -228,37 +228,43 @@ process_binpkg_dir(){
 			#eval $(${STAT} -s ${f} 2>/dev/null)
 			echo "pkgcache_begin ${fn}" >> ${tmpd}/${cachefile}
 			#echo "pkgcache_mtime=${st_mtime}" >> ${tmpd}/${cachefile}
 			$if_debug echo "${PKG_INFO} -q -B ${f}"
 			${PKG_INFO} -q -B ${f} >> ${tmpd}/${cachefile}
 			if test "${build_summary}" = "yes" ; then
 				$if_debug echo "${PKG_INFO} -X ${f}"
 				${PKG_INFO} -X ${f} >> ${tmpd}/${summaryfile}
 			fi
 			echo "pkgcache_end ${fn}" >> ${tmpd}/${cachefile}
 		done
 		if test -f ${d}/${cachefile} ; then
 			rm -f ${d}/${cachefile}
 		fi
 		mv -f ${tmpd}/${cachefile} ${d}/${cachefile}
 		if test $? -ne 0 ; then
 			echo "********** WARNING **********"
 			echo "move of ${tmpd}/${cachefile} to ${d}/${cachefile} failed!"
 			echo "Perhaps you do not have write permissions to ${d}?"
 			echo "This directory will be dropped from the master cache file."
 			echo "********** WARNING **********"
 			return
 		fi
 		if test "${build_summary}" = "yes" ; then
 			if test -f ${d}/${summaryfile}.gz ; then
 				rm -f ${d}/${summaryfile}.gz
 			fi
 			cat ${tmpd}/${summaryfile} | ${GZIP_CMD} > ${d}/${summaryfile}.gz
 			if test $? -ne 0 ; then
 				echo "********** WARNING **********"
 				echo "${GZIP_CMD} of ${tmpd}/${summaryfile} to ${d}/${summaryfile}.gz failed!"
 				echo "Perhaps you do not have write permissions to ${d}?"
 				echo "********** WARNING **********"
 				return
 			fi
 		fi
 	fi
 	# if we got here, then this directory should have a good cache file in