Date: Wed, 24 Aug 2011 16:30:14 GMT From: Aldis Berjoza <aldis@bsdroot.lv> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/159991: [PATCH] devel/py-mercurialserver mark IGNORE Message-ID: <201108241630.p7OGUEPL081111@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/159991; it has been noted by GNATS. From: Aldis Berjoza <aldis@bsdroot.lv> To: bug-followup@FreeBSD.org, aldis@bsdroot.lv Cc: Subject: Re: ports/159991: [PATCH] devel/py-mercurialserver mark IGNORE Date: Wed, 24 Aug 2011 19:22:45 +0300 --Sig_/YtxS9o9R.bH/nroosvn5lLn Content-Type: multipart/mixed; boundary="MP_/=euf//1.gShgM_wdRJ+RCW5" --MP_/=euf//1.gShgM_wdRJ+RCW5 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Attached patch, for port (against current ports tree) I found info how to fix issue with Mercurial 1.9 http://stackoverflow.com/questions/6730735/troubles-with-mercurial-1-9-and-= ssh Created and added patch Also I set minimal mercurial version to 1.9.1, because I have tested this to work with this version. 1.9.0 Might not even have this problem, I don't know. While here I cleaned Makefile a bit, so portlint now complains less :) --=20 Aldis Berjoza http://www.bsdroot.lv/ --MP_/=euf//1.gShgM_wdRJ+RCW5 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=py-mercurialserver.diff.txt diff -ruN py-mercurialserver.bak/Makefile py-mercurialserver/Makefile --- py-mercurialserver.bak/Makefile 2011-08-24 18:50:34.981674389 +0300 +++ py-mercurialserver/Makefile 2011-08-24 19:16:19.004775698 +0300 @@ -7,6 +7,7 @@ =20 PORTNAME=3D mercurialserver PORTVERSION=3D 1.1.0 +PORTREVISION=3D 1 CATEGORIES=3D devel python MASTER_SITES=3D http://dev.lshift.net/paul/mercurial-server/ PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} @@ -15,10 +16,11 @@ MAINTAINER=3D aldis@bsdroot.lv COMMENT=3D Software for hosting mercurial repositories =20 -RUN_DEPENDS=3D hg:${PORTSDIR}/devel/mercurial +LICENSE=3D GPLv2 + +RUN_DEPENDS=3D merurial>=3D1.9.1:${PORTSDIR}/devel/mercurial =20 WRKSRC=3D ${WRKDIR}/${SNAME}_${SVERSION} -LICENSE=3D GPLv2 SNAME=3D mercurial-server SVERSION=3D 1.1 =20 diff -ruN py-mercurialserver.bak/files/patch-setup.py py-mercurialserver/fi= les/patch-setup.py --- py-mercurialserver.bak/files/patch-setup.py 2011-08-24 18:50:34.9816743= 89 +0300 +++ py-mercurialserver/files/patch-setup.py 2011-08-24 18:53:31.059584600 += 0300 @@ -1,5 +1,5 @@ ---- ./setup.py.orig 2010-11-06 17:40:20.926497770 +0200 -+++ ./setup.py 2010-11-06 17:40:39.706412807 +0200 +--- ./setup.py.orig 2010-12-18 14:37:56.000000000 +0200 ++++ ./setup.py 2011-08-24 18:50:57.033917659 +0300 @@ -13,7 +13,7 @@ requires =3D ["mercurial"], # FIXME: what version? scripts =3D ['src/hg-ssh', 'src/refresh-auth'], diff -ruN py-mercurialserver.bak/files/patch-src__hg-ssh py-mercurialserver= /files/patch-src__hg-ssh --- py-mercurialserver.bak/files/patch-src__hg-ssh 1970-01-01 03:00:00.0000= 00000 +0300 +++ py-mercurialserver/files/patch-src__hg-ssh 2011-08-24 18:53:31.05557692= 9 +0300 @@ -0,0 +1,24 @@ +--- ./src/hg-ssh.orig 2011-08-24 18:53:19.312384124 +0300 ++++ ./src/hg-ssh 2011-08-24 18:53:08.694304509 +0300 +@@ -73,7 +73,9 @@ + repo =3D getrepo("read", cmd[6:-14]) + if not os.path.isdir(repo + "/.hg"): + fail("no such repository %s" % repo) +- dispatch.dispatch(['-R', repo, 'serve', '--stdio']) ++ ## Fix mercurialserver to work with mercurial 1.9 ++ #dispatch.dispatch(['-R', repo, 'serve', '--stdio']) ++ dispatch.dispatch(dispatch.request(['-R', repo, 'serve', '--stdio'])) + elif cmd.startswith('hg init '): + repo =3D getrepo("init", cmd[8:]) + if os.path.exists(repo): +@@ -81,7 +83,9 @@ + d =3D os.path.dirname(repo) + if d !=3D "" and not os.path.isdir(d): + os.makedirs(d) +- dispatch.dispatch(['init', repo]) ++ ## Fix mercurialserver to work with mercurial 1.9 ++ #dispatch.dispatch(['init', repo]) ++ dispatch.dispatch(dispatch.request(['init', repo])) + else: + fail("illegal command %r" % cmd) +=20 --MP_/=euf//1.gShgM_wdRJ+RCW5-- --Sig_/YtxS9o9R.bH/nroosvn5lLn Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iQEcBAEBAgAGBQJOVSVeAAoJECrA2xnMujn6txQIAJTcwvJOfi7zSYj9uwuOwS8X SnYzlsF6FgMkLn56hJoxgLHTQjBUvC5Lb8Z5GlSMywsSlFpP3kDJEo2dufaEjtlJ e1c+Lz2+k4pWTA/cuVl4Z8shQ4yibvuggVtn3gBZJ+vbH5EsFHnEe9m40bOprt2b dbNcHAqpaHkNlItVF51cM9PoWHScbCMsCkCtTPCrK35kGJC33Ol/kRLgaumpruhl C5Y31Xd6yp/rbmQB2XJ17yXnBFrauBW//qA7DlZhX144Y5QbinD2KygKNX30hLLO vy+0OpzEKKeF6ZP8KHwfUbyJwXq0ph9aLyqbl91BLO2cdd3Xka3ZmQLr/YtUsC4= =u7fj -----END PGP SIGNATURE----- --Sig_/YtxS9o9R.bH/nroosvn5lLn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108241630.p7OGUEPL081111>