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

[Brooks Davis]

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}:"