Thu Dec 3 12:44:58 2009 UTC ()

Exit with a sensible error message if makeflist output is empty.
This should be better than an incomprehensible error message from
mtree.


(apb)

diff -r1.70 -r1.71 src/distrib/sets/maketars

--- src/distrib/sets/maketars 2009/11/30 16:13:23	1.70
+++ src/distrib/sets/maketars 2009/12/03 12:44:57	1.71

 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: maketars,v 1.70 2009/11/30 16:13:23 uebayasi Exp $
+# $NetBSD: maketars,v 1.71 2009/12/03 12:44:57 apb Exp $
+#
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
 #	[-M metalog] [-N etcdir] [-d destdir] [-t tardir] [setname ...]
+#
 # The default sets are "base comp etc games man misc tests text"
 # The X sets are "xbase xcomp xetc xfont xserver"
 # The extsrc sets are "extbase extcomp extetc"
+#
 # If '-i installdir' is given, copy the given sets to installdir
 # (using pax -rw ...) instead of creating tar files.
 # In this case, remove "etc", "xetc", and "extetc" from the list of default sets.
+#
 @@ -151,26 +151,30 @@ cleanup()
 	trap - 0
 	exit ${es}
+}
 trap cleanup 0 2 3 13		# EXIT INT QUIT PIPE
+#
 # build the setfiles
+#
 for setname in ${lists}; do
 	${HOST_SH} "${setsdir}/makeflist" -a "${MACHINE_ARCH}" -m "${MACHINE}" \
 	    -s "${setsdir}" "${setname}" > "${SDIR}/flist.${setname}" \
 	    || exit 1
 	if ! [ -s "${SDIR}/flist.${setname}" ]; then
 		echo >&2 "makeflist output is empty for ${setname}"
 		exit 1
 	fi
 	if [ -n "${metalog}" ]; then
 		${setfilesonly} && msg "Creating ${setlistdir}/set.${setname}"
 		${AWK} -f "${rundir}/getdirs.awk" "${SDIR}/flist.${setname}" \
 		    > "${SDIR}/flist.${setname}.full" \
 		    || exit 1
+		(
 			echo "/set uname=root gname=wheel"
 			${AWK} -f "${rundir}/join.awk" \
 				"${SDIR}/flist.${setname}.full" "${metalog}"
 			echo "./etc/mtree/set.${setname} type=file mode=0444"
 		) | ${MTREE} -CS -k all -R time -N "${etcdir}" \
 		    > "${setlistdir}/set.${setname}" \
 		    || exit 1