Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Oct 2018 12:40:24 +0000 (UTC)
From:      Michael Gmelin <grembo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r483022 - in head/devel/py-buildbot-worker: . files
Message-ID:  <201810261240.w9QCeOr0028275@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: grembo
Date: Fri Oct 26 12:40:24 2018
New Revision: 483022
URL: https://svnweb.freebsd.org/changeset/ports/483022

Log:
  Fix twistd binary name in rc script for non-default python versions.
  
  PR:		227675
  Submitted by:	Andreas Sommer <andreas.sommer87@googlemail.com>
  Approved by:	koobs (maintainer)
  MFH:		1 week

Modified:
  head/devel/py-buildbot-worker/Makefile
  head/devel/py-buildbot-worker/files/buildbot-worker.in

Modified: head/devel/py-buildbot-worker/Makefile
==============================================================================
--- head/devel/py-buildbot-worker/Makefile	Fri Oct 26 12:18:20 2018	(r483021)
+++ head/devel/py-buildbot-worker/Makefile	Fri Oct 26 12:40:24 2018	(r483022)
@@ -3,6 +3,7 @@
 
 PORTNAME=	buildbot-worker
 PORTVERSION=	0.9.15
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +23,7 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	buildbot-worker
 
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
+SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
 
 NO_ARCH=	yes
 

Modified: head/devel/py-buildbot-worker/files/buildbot-worker.in
==============================================================================
--- head/devel/py-buildbot-worker/files/buildbot-worker.in	Fri Oct 26 12:18:20 2018	(r483021)
+++ head/devel/py-buildbot-worker/files/buildbot-worker.in	Fri Oct 26 12:40:24 2018	(r483022)
@@ -57,7 +57,7 @@ eval ": \${${name}_uid:=\"buildbot\"}"
 eval ": \${${name}_gid:=\"buildbot\"}"
 eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}"
 
-command="%%PREFIX%%/bin/twistd"
+command="%%PREFIX%%/bin/twistd-%%PYTHON_VER%%"
 command_interpreter="%%PYTHON_CMD%%"
 pidfile="${buildbot_worker_basedir}/twistd.pid"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810261240.w9QCeOr0028275>