From citrin@citrin.ru  Fri Jan 22 16:19:09 2010
Return-Path: <citrin@citrin.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22B6F1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 22 Jan 2010 16:19:09 +0000 (UTC)
	(envelope-from citrin@citrin.ru)
Received: from mail.vega.ru (mail.vega.ru [90.156.167.5])
	by mx1.freebsd.org (Postfix) with ESMTP id CF9528FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 22 Jan 2010 16:19:08 +0000 (UTC)
Received: from storage.spylog.stage.vega.ru ([10.25.1.96] helo=x0045.mgmt.vega.ru)
	by mail.vega.ru with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.71 (FreeBSD))
	(envelope-from <citrin@citrin.ru>)
	id 1NYMDz-000LgN-T2; Fri, 22 Jan 2010 19:19:07 +0300
Received: from x0045.mgmt.vega.ru (localhost [127.0.0.1])
	by x0045.mgmt.vega.ru (8.14.3/8.14.3) with ESMTP id o0MGJ7Nt007806;
	Fri, 22 Jan 2010 16:19:07 GMT
	(envelope-from citrin@citrin.ru)
Received: (from ayuzhaninov@localhost)
	by x0045.mgmt.vega.ru (8.14.3/8.14.3/Submit) id o0MGJ7Kg007805;
	Fri, 22 Jan 2010 16:19:07 GMT
	(envelope-from citrin@citrin.ru)
Message-Id: <201001221619.o0MGJ7Kg007805@x0045.mgmt.vega.ru>
Date: Fri, 22 Jan 2010 16:19:07 GMT
From: Anton Yuzhaninov <citrin@citrin.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dougb@freebsd.org
Subject: mergemaster(8) does not honor -D when select path to mtree file (for -U)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         143089
>Category:       bin
>Synopsis:       mergemaster(8) does not honor -D when select path to mtree file (for -U)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 22 16:20:01 UTC 2010
>Closed-Date:    Tue Jan 26 18:27:29 UTC 2010
>Last-Modified:  Tue Jan 26 18:30:10 UTC 2010
>Originator:     Anton Yuzhaninov
>Release:        FreeBSD 7.2-STABLE-20100121 amd64
>Organization:
>Environment:

# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.54.2.7 2010/01/15 03:39:03 dougb Exp $

>Description:
for -U /var/db/mergemaster.mtree always used, even when -D (DESTDIR) is not empty

>How-To-Repeat:
run
mergemaster -U -D /path/to/jail

/var/db/mergemaster.mtree will be used, instead
/path/to/jail/var/db/mergemaster.mtree
>Fix:

Move MTREEDB/MTREEFILE variables assignment
after command line options read

--- mergemaster.patch begins here ---
--- /usr/sbin/mergemaster       2010-01-21 13:33:41.000000000 +0000
+++ mergemaster 2010-01-22 14:44:27.000000000 +0000
@@ -261,11 +261,6 @@
   . "$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 @@
   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`
--- mergemaster.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: dougb 
State-Changed-When: Fri Jan 22 17:18:07 UTC 2010 
State-Changed-Why:  

Thank you for bringing this to my attention, silly mistake 
on my part. 

I've patched it in HEAD and will MFC ASAP. 


Regards, 

Doug 


Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Fri Jan 22 17:18:07 UTC 2010 
Responsible-Changed-Why:  

My bug. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143089 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/143089: commit references a PR
Date: Fri, 22 Jan 2010 17:18:01 +0000 (UTC)

 Author: dougb
 Date: Fri Jan 22 17:17:47 2010
 New Revision: 202817
 URL: http://svn.freebsd.org/changeset/base/202817
 
 Log:
   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>
 
 Modified:
   head/usr.sbin/mergemaster/mergemaster.sh
 
 Modified: head/usr.sbin/mergemaster/mergemaster.sh
 ==============================================================================
 --- head/usr.sbin/mergemaster/mergemaster.sh	Fri Jan 22 17:08:05 2010	(r202816)
 +++ head/usr.sbin/mergemaster/mergemaster.sh	Fri Jan 22 17:17:47 2010	(r202817)
 @@ -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`
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: dougb 
State-Changed-When: Tue Jan 26 18:27:05 UTC 2010 
State-Changed-Why:  

The fix was MFC'ed. Thanks again. 


Doug 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143089 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/143089: commit references a PR
Date: Tue, 26 Jan 2010 18:24:22 +0000 (UTC)

 Author: dougb
 Date: Tue Jan 26 18:24:13 2010
 New Revision: 203037
 URL: http://svn.freebsd.org/changeset/base/203037
 
 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>
 
 Modified:
   stable/8/usr.sbin/mergemaster/mergemaster.sh
 Directory Properties:
   stable/8/usr.sbin/mergemaster/   (props changed)
 
 Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh
 ==============================================================================
 --- stable/8/usr.sbin/mergemaster/mergemaster.sh	Tue Jan 26 17:21:25 2010	(r203036)
 +++ stable/8/usr.sbin/mergemaster/mergemaster.sh	Tue Jan 26 18:24:13 2010	(r203037)
 @@ -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`
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/143089: commit references a PR
Date: Tue, 26 Jan 2010 18:25:37 +0000 (UTC)

 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`
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
