From owner-svn-src-stable@FreeBSD.ORG  Tue Jan 26 18:25:23 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A198106566C;
	Tue, 26 Jan 2010 18:25:23 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 286F58FC13;
	Tue, 26 Jan 2010 18:25:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0QIPN53067870;
	Tue, 26 Jan 2010 18:25:23 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0QIPNgJ067868;
	Tue, 26 Jan 2010 18:25:23 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201001261825.o0QIPNgJ067868@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 26 Jan 2010 18:25:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203038 - stable/7/usr.sbin/mergemaster
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2010 18:25:23 -0000

Author: dougb
Date: Tue Jan 26 18:25:22 2010
New Revision: 203038
URL: http://svn.freebsd.org/changeset/base/203038

Log:
  MFC r202817:
  
  Make -U once again honor -D after my change to consolidate setting
  of MTREEDB with DESTDIR.
  
  PR:             bin/143089
  Submitted by:   Anton Yuzhaninov <citrin@citrin.ru>
  
  Approved by:	re (kensmith)

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

Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.sh	Tue Jan 26 18:24:13 2010	(r203037)
+++ stable/7/usr.sbin/mergemaster/mergemaster.sh	Tue Jan 26 18:25:22 2010	(r203038)
@@ -261,11 +261,6 @@ if [ -r "$HOME/.mergemasterrc" ]; then
   . "$HOME/.mergemasterrc"
 fi
 
-# Assign the location of the mtree database
-#
-MTREEDB=${MTREEDB:-${DESTDIR}/var/db}
-MTREEFILE="${MTREEDB}/mergemaster.mtree"
-
 # Check the command line options
 #
 while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do
@@ -342,6 +337,11 @@ while getopts ":ascrvhipCPm:t:du:w:D:A:F
   esac
 done
 
+# Assign the location of the mtree database
+#
+MTREEDB=${MTREEDB:-${DESTDIR}/var/db}
+MTREEFILE="${MTREEDB}/mergemaster.mtree"
+
 # Don't force the user to set this in the mergemaster rc file
 if [ -n "${PRESERVE_FILES}" -a -z "${PRESERVE_FILES_DIR}" ]; then
   PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`