Date: Fri, 4 Jan 2019 10:16:00 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489253 - in head/devel/py-buildbot: . files Message-ID: <201901041016.x04AG0kC014605@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Fri Jan 4 10:16:00 2019 New Revision: 489253 URL: https://svnweb.freebsd.org/changeset/ports/489253 Log: devel/py-buildbot: Version-suffix rc script command For python ports, particularly those that use USE_PYTHON=concurrent, only the *default* python version/flavor (of the port) gets symlinks created for any script/binary filenames installed in LOCALBASE/bin. For non-default Python versions/flavors of the port or package, *only* a version-suffixed script filename is installed. The devel/buildbot-worker rc script was fixed in ports r483022 [1] to use a version-suffixed script name. This change fixes the same for devel/py-buildbot, whos rc script currently fails to run due to trying to invoke a non-existent 'buildbot' script name for the non-default (!2.7) case. Since a port/package cannot know at run time, at any point what the default Python version currently is, or whether it has changed, Python ports *must* always and only refer to version-specific variants for everything, including the Python interpreter, script shebangs, commands, paths, etc, for the Python version they are currently being built with. PR: 234565, 227675 [1] Reported by: Andreas Sommer <andreas.sommer87 googlemail com> MFH: 2019Q1 Modified: head/devel/py-buildbot/Makefile head/devel/py-buildbot/files/buildbot.in Modified: head/devel/py-buildbot/Makefile ============================================================================== --- head/devel/py-buildbot/Makefile Fri Jan 4 09:38:09 2019 (r489252) +++ head/devel/py-buildbot/Makefile Fri Jan 4 10:16:00 2019 (r489253) @@ -3,6 +3,7 @@ PORTNAME= buildbot PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -29,7 +30,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-tre ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>0:devel/py-buildbot-pkg@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>0:devel/py-buildbot-pkg@${PY_FLAVOR} # to be ported ${PYTHON_PKGNAMEPREFIX}pyjade>0:www/py-pyjade@${PY_FLAVOR} # to be ported ${PYTHON_PKGNAMEPREFIX}moto>0:www/py-moto@${PY_FLAVOR} @@ -37,7 +38,7 @@ USES= python USE_RC_SUBR= buildbot USE_PYTHON= autoplist concurrent distutils -SUB_LIST= PYTHON_CMD=${PYTHON_CMD} +SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER} NO_ARCH= yes Modified: head/devel/py-buildbot/files/buildbot.in ============================================================================== --- head/devel/py-buildbot/files/buildbot.in Fri Jan 4 09:38:09 2019 (r489252) +++ head/devel/py-buildbot/files/buildbot.in Fri Jan 4 10:16:00 2019 (r489253) @@ -19,7 +19,7 @@ export PATH=${PATH}:%%PREFIX%%/bin name="buildbot" rcvar=buildbot_enable -command="%%PREFIX%%/bin/buildbot" +command="%%PREFIX%%/bin/buildbot-%%PYTHON_VER%%" load_rc_config $name check_cmd="${name}_check"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901041016.x04AG0kC014605>