[src/trunk]: src/distrib/sets Thinko; missing/extra are generated differently...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8543b42781fd
branches:  trunk
changeset: 749841:8543b42781fd
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Dec 10 17:18:33 2009 +0000

description:
Thinko; missing/extra are generated differently for metalog/destdir comparison
methods.  Fix mistakenly merged generation functions.

diffstat:

 distrib/sets/checkflist |  27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 859f2f672fab -r 8543b42781fd distrib/sets/checkflist
--- a/distrib/sets/checkflist   Thu Dec 10 17:07:26 2009 +0000
+++ b/distrib/sets/checkflist   Thu Dec 10 17:18:33 2009 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh --
 #
-#      $NetBSD: checkflist,v 1.40 2009/12/10 16:40:21 uebayasi Exp $
+#      $NetBSD: checkflist,v 1.41 2009/12/10 17:18:33 uebayasi Exp $
 #
 # Verify output of makeflist against contents of ${DESTDIR} and ${metalog}.
 
@@ -130,16 +130,26 @@
 fi
 }
 
-generate_missing()
+generate_mlist_missing()
 {
        ${COMM} -23 "${SDIR}/files" "${SDIR}/mlist" > "${SDIR}/missing"
 }
 
-generate_extra()
+generate_mlist_extra()
 {
        ${COMM} -13 "${SDIR}/files" "${SDIR}/mlist" > "${SDIR}/extra"
 }
 
+generate_files_missing()
+{
+       ${COMM} -23 "${SDIR}/flist" "${SDIR}/files" > "${SDIR}/missing"
+}
+
+generate_files_extra()
+{
+       ${COMM} -13 "${SDIR}/flist" "${SDIR}/files" > "${SDIR}/extra"
+}
+
 exist_case_insensitive()
 {
        while read f; do
@@ -251,13 +261,16 @@
 generate_files
 generate_flist
 generate_mlist
-generate_missing
-generate_extra
 
-# XXX: Temporarily disabled due to problems with obsolete files in metalog
 if false && [ -n "${metalog}" ]; then
+       # XXX: Temporarily disabled due to problems with obsolete files in metalog
+       generate_mlist_missing
+       generate_mlist_extra
        compare_metalog
+else
+       generate_files_missing
+       generate_files_extra
+       compare_destdir
 fi
-compare_destdir
 
 exit 0         # cleanup will exit with ${es}