Date: Thu, 6 Apr 2006 01:08:01 +0200 From: Jean-Baptiste Quenot <jbq@caraldi.com> To: gnome@FreeBSD.org Subject: Re: marcusmerge failure with relative SRCDIR Message-ID: <20060405230800.GA83855@watt.intra.caraldi.com> In-Reply-To: <20060401101848.GB20226@watt.intra.caraldi.com> References: <20060401101848.GB20226@watt.intra.caraldi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline * 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@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/ --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=20060406-marcusmerge-relative-SRCDIR --- 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 --NzB8fVQJ5HfG6fxh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060405230800.GA83855>