svn commit: r201323 - head/usr.sbin/mergemaster

[Doug Barton]

Author: dougb
Date: Thu Dec 31 04:07:13 2009
New Revision: 201323
URL: http://svn.freebsd.org/changeset/base/201323

Log:
  If we are using -p it does not make any sense to even create the
  MTREENEW file since it will never be used.

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Thu Dec 31 03:25:27 2009	(r201322)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Thu Dec 31 04:07:13 2009	(r201323)
@@ -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.