Author: jilles
Date: Mon Apr 14 22:01:49 2014
New Revision: 264480
URL: http://svnweb.freebsd.org/changeset/base/264480
Log:
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
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Mon Apr 14 21:44:34 2014
(r264479)
+++ head/usr.sbin/mergemaster/mergemaster.sh Mon Apr 14 22:01:49 2014
(r264480)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
