upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-13 18:50:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Solve the problem of spuriously comparing files that were created

Browse source 
in the ${TEMPROOT}/usr/obj directory by deleting them first.
This commit is contained in:
Doug Barton 2002-04-08 10:30:44 +00:00
parent 64503575e3
commit 3e9d29b012
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr.sbin/mergemaster/mergemaster.sh
View file

@ -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,