diff options
| author | dougb <dougb@FreeBSD.org> | 2002-04-08 10:30:44 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-04-08 10:30:44 +0000 |
| commit | 34705cdf606a0f7310984a1944e71ec379f50c4e (patch) | |
| tree | 5afcfda23008561d25a9cbc24ddd025f4d7423fd /usr.sbin/mergemaster | |
| parent | 28f0a70b761a741e523424afa8c37a2f0110df72 (diff) | |
| download | FreeBSD-src-34705cdf606a0f7310984a1944e71ec379f50c4e.zip FreeBSD-src-34705cdf606a0f7310984a1944e71ec379f50c4e.tar.gz | |
Solve the problem of spuriously comparing files that were created
in the ${TEMPROOT}/usr/obj directory by deleting them first.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 7816a6b..960e83e 100755 --- 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, |
