d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing to

Browse Source 
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
This commit is contained in:
Jilles Tjoelker 2014-04-14 22:01:49 +00:00
parent 27e21758b8
commit 819b4fd06a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=264480
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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