From owner-svn-src-all@FreeBSD.ORG  Tue Nov 26 16:13:49 2013
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 23FE93A0;
 Tue, 26 Nov 2013 16:13:49 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 131422A22;
 Tue, 26 Nov 2013 16:13:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQGDmg6038254;
 Tue, 26 Nov 2013 16:13:48 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQGDm3J038253;
 Tue, 26 Nov 2013 16:13:48 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201311261613.rAQGDm3J038253@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 26 Nov 2013 16:13:48 +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: r258657 - 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.16
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: Tue, 26 Nov 2013 16:13:49 -0000

Author: brooks
Date: Tue Nov 26 16:13:48 2013
New Revision: 258657
URL: http://svnweb.freebsd.org/changeset/base/258657

Log:
  MFC: r258456
  
  Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree is
  nmtree.
  
  The mtree output used by mergemaster in this case was clearly not meant for
  computer consumption and an approach based on -f <file1> -f <file2> would
  probably be a better idea, but this is a minimal change.
  
  Approved by:	re (glebius)

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

Modified: stable/10/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/10/usr.sbin/mergemaster/mergemaster.sh	Tue Nov 26 16:13:38 2013	(r258656)
+++ stable/10/usr.sbin/mergemaster/mergemaster.sh	Tue Nov 26 16:13:48 2013	(r258657)
@@ -492,8 +492,14 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCED
 # files the user changed from the reference files.
 #
 if [ -n "${AUTO_UPGRADE}" -a -s "${MTREEFILE}" ]; then
+	# Force FreeBSD 9 compatible output when available.
+	if mtree -F freebsd9 -c -p /var/empty/ > /dev/null 2>&1; then
+		MTREE_FLAVOR="-F freebsd9"
+	else
+		MTREE_FLAVOR=
+	fi
 	CHANGED=:
-	for file in `mtree -eqL -f ${MTREEFILE} -p ${DESTDIR}/ \
+	for file in `mtree -eqL ${MTREE_FLAVOR} -f ${MTREEFILE} -p ${DESTDIR}/ \
 		2>/dev/null | awk '($2 == "changed") {print $1}'`; do
 		if [ -f "${DESTDIR}/$file" ]; then
 			CHANGED="${CHANGED}${DESTDIR}/${file}:"