From owner-freebsd-bugs@FreeBSD.ORG  Mon Nov 26 07:10:01 2012
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 09E6DE4D
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Mon, 26 Nov 2012 07:10:01 +0000 (UTC)
 (envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id B97D98FC13
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Mon, 26 Nov 2012 07:10:00 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQ7A0ro003140
 for <freebsd-bugs@freefall.freebsd.org>; Mon, 26 Nov 2012 07:10:00 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAQ7A0qo003136;
 Mon, 26 Nov 2012 07:10:00 GMT (envelope-from gnats)
Resent-Date: Mon, 26 Nov 2012 07:10:00 GMT
Resent-Message-Id: <201211260710.qAQ7A0qo003136@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
 Garrett Cooper <yanegomi@gmail.com>
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 <yanegomi@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Subject: conf/173929: [patch] [mergemaster] allow relative paths for SRCDIR
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Nov 2012 07:10:01 -0000


>Number:         173929
>Category:       conf
>Synopsis:       [patch] [mergemaster] allow relative paths for SRCDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 26 07:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: