From owner-svn-src-all@FreeBSD.ORG  Sun Jun  1 18:52:22 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6A4889E8;
 Sun,  1 Jun 2014 18:52:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 566E4266A;
 Sun,  1 Jun 2014 18:52:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51IqMTL019367;
 Sun, 1 Jun 2014 18:52:22 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51IqMif019366;
 Sun, 1 Jun 2014 18:52:22 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201406011852.s51IqMif019366@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 1 Jun 2014 18:52:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r266953 - stable/10/usr.sbin/mergemaster
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jun 2014 18:52:22 -0000

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