svn commit: r266953 - stable/10/usr.sbin/mergemaster

[Jilles Tjoelker]

Author: jilles
Date: Sun Jun  1 18:52:21 2014
New Revision: 266953
URL: http://svnweb.freebsd.org/changeset/base/266953

Log:
  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

Modified:
  stable/10/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/10/usr.sbin/mergemaster/mergemaster.sh	Sun Jun  1 18:41:33 2014	(r266952)
+++ stable/10/usr.sbin/mergemaster/mergemaster.sh	Sun Jun  1 18:52:21 2014	(r266953)
@@ -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