Solve the problem of spuriously comparing files that were created

in the ${TEMPROOT}/usr/obj directory by deleting them first.
2002-04-08 10:30:44 +00:00 · 2002-04-08 10:30:44 +00:00 · 4ceb4c68e5
commit 4ceb4c68e5
parent fd570d6f1a
1 changed files with 3 additions and 0 deletions
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@ -528,6 +528,9 @@ esac
 #
 rm -f ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db

+# We only need to compare things like freebsd.cf once
+find ${TEMPROOT}/usr/obj -type f -delete
+
 # Get ready to start comparing files

 # Check umask if not specified on the command line,