diff options
| author | jilles <jilles@FreeBSD.org> | 2014-06-01 18:52:21 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2014-06-01 18:52:21 +0000 |
| commit | 5b93c96241c27504b5c6005f0d3146b0d1e0c52d (patch) | |
| tree | 6b6bfd53ee476b0896f734d9af978a7c9aff5794 /usr.sbin/mergemaster | |
| parent | 5eb02565b3c43bf580a95adf065f82eb33ba7364 (diff) | |
| download | FreeBSD-src-5b93c96241c27504b5c6005f0d3146b0d1e0c52d.zip FreeBSD-src-5b93c96241c27504b5c6005f0d3146b0d1e0c52d.tar.gz | |
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
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 f3aafae..1b258d7 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -708,7 +708,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 |
