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 /usr.sbin/mergemaster | |
| 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 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index c5ed5fd..a200088 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -709,7 +709,7 @@ case "${RERUN}" in # and to make the actual comparison faster. find ${TEMPROOT}/usr -type l -delete 2>/dev/null find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null - find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null + find -d ${TEMPROOT} -type d -empty -mindepth 1 -delete 2>/dev/null # Build the mtree database in a temporary location. case "${PRE_WORLD}" in |
