mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

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
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94196
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 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 # Get ready to start comparing files
# Check umask if not specified on the command line, # Check umask if not specified on the command line,