]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
MFC r264480: mergemaster: Avoid "/var/tmp/temproot disappeared" if there is
authorjilles <jilles@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 1 Jun 2014 18:52:21 +0000 (18:52 +0000)
committerjilles <jilles@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sun, 1 Jun 2014 18:52:21 +0000 (18:52 +0000)
commit4b98e944c4d72a9439aedeb12c980d7afb1cb78e
tree6b6bfd53ee476b0896f734d9af978a7c9aff5794
parent62b6e16aa72bc0ee3fdc08415c7f82a51d234440
MFC r264480: mergemaster: Avoid "/var/tmp/temproot disappeared" if there is
nothing to compare.

Because of the change to find in SVN r253886, the entire temproot would be
deleted if it became empty, leading to a confusing message "*** FATAL ERROR:
The temproot directory ${TEMPROOT} has disappeared!"

Note that mergemaster does not do anything useful in this situation anyway
(e.g. put IGNORE_FILES="/etc/group /etc/master.passwd" in
/etc/mergemaster.rc and run mergemaster -p).

As noted in that commit, add -mindepth 1.

PR: bin/188485
Submitted by: David Boyd

git-svn-id: svn://svn.freebsd.org/base/stable/10@266953 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
usr.sbin/mergemaster/mergemaster.sh