From 15768c780ab653f9abe64d098fc2edb303080ad3 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 31 Dec 2009 04:07:13 +0000
Subject: [PATCH] If we are using -p it does not make any sense to even create
 the MTREENEW file since it will never be used.

---
 usr.sbin/mergemaster/mergemaster.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 5703bf36e568..acc7b3b2d1c2 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -686,9 +686,9 @@ case "${RERUN}" in
   find -d ${TEMPROOT} -type d -empty -delete 2>/dev/null
 
   # Build the mtree database in a temporary location.
-  MTREENEW=`mktemp -t mergemaster.mtree`
   case "${PRE_WORLD}" in
-  '') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
+  '') MTREENEW=`mktemp -t mergemaster.mtree`
+      mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
       ;;
   *) # We don't want to mess with the mtree database on a pre-world run or
      # when re-scanning a previously-built tree.