svn commit: r203038 - stable/7/usr.sbin/mergemaster
Doug Barton
dougb at FreeBSD.org
Tue Jan 26 18:25:23 UTC 2010
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 at 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`
More information about the svn-src-stable-7
mailing list