marcusmerge failure with relative SRCDIR

[Jean-Baptiste Quenot]

* Jean-Baptiste Quenot:
> 
> It seems that when using a relative path for SRCDIR, marcusmerge
> fails:
> 
> $ MARCUSMERGE_SRCDIR=tmp/marcus MARCUSMERGE_SUPFILE=/usr/local/share/cvsup/ports-supfile sudo ./marcusmerge -u
> First we have to check out the ports module from
> http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi
> Please type 'anoncvs' as your password.
> 
> Logging in to :pserver:anonymous at creme-brulee.marcuscom.com:2401/space/cvs/marcuscom-cvs
> CVS password:
> ===> Checking out the ports module.
> ...
> ===> Checkout done.
> ===> Merging files into the ports directory
> tmp/marcus/ports --> /usr/ports
> ls: tmp/marcus/ports: No such file or directory
> ===> Merging done.
> 
> When I use an absolute path for MARCUSMERGE_SRCDIR it works.

Please find attached a patch to address this issue.

All the best,
-- 
     Jean-Baptiste Quenot
aka  John Banana Qwerty
http://caraldi.com/jbq/
-------------- next part --------------
--- marcusmerge.orig	Thu Apr  6 01:02:38 2006
+++ marcusmerge	Thu Apr  6 01:03:28 2006
@@ -289,6 +289,11 @@
     exit 1
 fi
 
+if [ ${SRCDIR} = ${SRCDIR#/} ]; then
+    # Absolutize path
+    SRCDIR=$(pwd)/${SRCDIR}
+fi
+
 first_time=0
 
 # If the SRCDIR doesn't exist, we need to download the repo.  Currently, we