diff options
author | jilles <jilles@FreeBSD.org> | 2014-04-14 22:01:49 +0000 |
---|---|---|
committer | jilles <jilles@FreeBSD.org> | 2014-04-14 22:01:49 +0000 |
commit | 7904a8a1e65ab3ee43a5479ca7cd9bbe3c80f916 (patch) | |
tree | 55fb781fdffbd74b49a3f80da22ea627530ab86f /lib/libc/stdlib | |
parent | 8ac2dd562fe7fbc055cb8d7525b7255ee0c56847 (diff) | |
download | FreeBSD-src-7904a8a1e65ab3ee43a5479ca7cd9bbe3c80f916.zip FreeBSD-src-7904a8a1e65ab3ee43a5479ca7cd9bbe3c80f916.tar.gz |
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
MFC after: 1 week
Diffstat (limited to 'lib/libc/stdlib')
0 files changed, 0 insertions, 0 deletions