From nobody@FreeBSD.org  Mon Nov 26 07:00:46 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E4EC8D1C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Nov 2012 07:00:46 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id C75078FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Nov 2012 07:00:46 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQ70kG6029374
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Nov 2012 07:00:46 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qAQ70kvL029373;
	Mon, 26 Nov 2012 07:00:46 GMT
	(envelope-from nobody)
Message-Id: <201211260700.qAQ70kvL029373@red.freebsd.org>
Date: Mon, 26 Nov 2012 07:00:46 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] [mergemaster] allow relative paths for SRCDIR
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173929
>Category:       bin
>Synopsis:       [patch] mergemaster(8): allow relative paths for SRCDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 26 07:10:00 UTC 2012
>Closed-Date:    Mon May 13 01:20:30 UTC 2013
>Last-Modified:  Mon May 13 01:30:01 UTC 2013
>Originator:     Garrett Cooper
>Release:        9-STABLE
>Organization:
EMC Isilon
>Environment:
FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012     gcooper@bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64
>Description:
Due to the cd'ing in mergemaster(8), relative paths aren't allowed via mergemaster -m. The attached patch enables that support.
>How-To-Repeat:
mergemaster -m .
>Fix:


Patch attached with submission follows:

Index: usr.sbin/mergemaster/mergemaster.sh
===================================================================
--- usr.sbin/mergemaster/mergemaster.sh	(revision 242903)
+++ usr.sbin/mergemaster/mergemaster.sh	(working copy)
@@ -490,6 +490,7 @@
   sleep 3
   SOURCEDIR=${SOURCEDIR}/..
 fi
+SOURCEDIR=$(realpath "$SOURCEDIR")
 
 # Setup make to use system files from SOURCEDIR
 MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Fri May 10 17:19:29 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173929 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Mon May 13 01:20:30 UTC 2013 
State-Changed-Why:  
committed, MFCed 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/173929: commit references a PR
Date: Mon, 13 May 2013 01:21:05 +0000 (UTC)

 Author: eadler
 Date: Mon May 13 01:20:36 2013
 New Revision: 250584
 URL: http://svnweb.freebsd.org/changeset/base/250584
 
 Log:
   MFC r250463:
   	Permit relative paths with mergemaster -m
   
   PR:	bin/173929
 
 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	Mon May 13 01:20:31 2013	(r250583)
 +++ stable/8/usr.sbin/mergemaster/mergemaster.sh	Mon May 13 01:20:36 2013	(r250584)
 @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a 
    sleep 3
    SOURCEDIR=${SOURCEDIR}/..
  fi
 +SOURCEDIR=$(realpath "$SOURCEDIR")
  
  # Setup make to use system files from SOURCEDIR
  MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"
 _______________________________________________
 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/173929: commit references a PR
Date: Mon, 13 May 2013 01:20:49 +0000 (UTC)

 Author: eadler
 Date: Mon May 13 01:20:31 2013
 New Revision: 250583
 URL: http://svnweb.freebsd.org/changeset/base/250583
 
 Log:
   MFC r250463:
   	Permit relative paths with mergemaster -m
   
   PR:	bin/173929
 
 Modified:
   stable/9/usr.sbin/mergemaster/mergemaster.sh
 Directory Properties:
   stable/9/usr.sbin/mergemaster/   (props changed)
 
 Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
 ==============================================================================
 --- stable/9/usr.sbin/mergemaster/mergemaster.sh	Sun May 12 22:22:12 2013	(r250582)
 +++ stable/9/usr.sbin/mergemaster/mergemaster.sh	Mon May 13 01:20:31 2013	(r250583)
 @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a 
    sleep 3
    SOURCEDIR=${SOURCEDIR}/..
  fi
 +SOURCEDIR=$(realpath "$SOURCEDIR")
  
  # Setup make to use system files from SOURCEDIR
  MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"
 _______________________________________________
 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:
