Module Name: src
Committed By: uebayasi
Date: Thu Dec 10 16:12:00 UTC 2009
Modified Files:
src/distrib/sets: checkflist
Log Message:
Refactor; move generate_* function calls in single place.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/checkflist
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/checkflist
diff -u src/distrib/sets/checkflist:1.37 src/distrib/sets/checkflist:1.38
--- src/distrib/sets/checkflist:1.37 Thu Dec 10 16:09:13 2009
+++ src/distrib/sets/checkflist Thu Dec 10 16:12:00 2009
@@ -1,6 +1,6 @@
#! /bin/sh --
#
-# $NetBSD: checkflist,v 1.37 2009/12/10 16:09:13 uebayasi Exp $
+# $NetBSD: checkflist,v 1.38 2009/12/10 16:12:00 uebayasi Exp $
#
# Verify output of makeflist against contents of ${DESTDIR} and ${metalog}.
@@ -136,10 +136,6 @@
${COMM} -13 "${SDIR}/files" "${SDIR}/mlist" > "${SDIR}/extra"
}
-generate_files
-generate_flist
-generate_mlist
-
#
# compare DESTDIR with METALOG, and report on differences.
#
@@ -147,9 +143,6 @@
#
compare_metalog()
{
- generate_missing
- generate_extra
-
# Handle case insensitive filesystems
mv -f "${SDIR}/extra" "${SDIR}/extra.all"
while read f; do
@@ -203,9 +196,6 @@
#
compare_destdir()
{
-generate_missing
-generate_extra
-
# Handle case insensitive filesystems
mv -f "${SDIR}/missing" "${SDIR}/missing.all"
while read f; do
@@ -258,6 +248,12 @@
fi
}
+generate_files
+generate_flist
+generate_mlist
+generate_missing
+generate_extra
+
compare_destdir
exit 0 # cleanup will exit with ${es}
