From 287bcb661fdc07ef7405d7f664bb55e9e2005d8c Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Wed, 17 Aug 2016 09:54:34 -0700 Subject: [PATCH] dev-util/buildbot: Use python2 in the buildmaster.initd startup (bug 591150) This allows a proper startup if a python3 version is the system default. Package-Manager: portage-2.3.0 Signed-off-by: Brian Dolbec --- .../{buildbot-0.8.12-r2.ebuild => buildbot-0.8.12-r3.ebuild} | 0 ...uildbot-0.9.0_rc1-r1.ebuild => buildbot-0.9.0_rc1-r2.ebuild} | 0 dev-util/buildbot/files/buildmaster.initd | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename dev-util/buildbot/{buildbot-0.8.12-r2.ebuild => buildbot-0.8.12-r3.ebuild} (100%) rename dev-util/buildbot/{buildbot-0.9.0_rc1-r1.ebuild => buildbot-0.9.0_rc1-r2.ebuild} (100%) diff --git a/dev-util/buildbot/buildbot-0.8.12-r2.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild similarity index 100% rename from dev-util/buildbot/buildbot-0.8.12-r2.ebuild rename to dev-util/buildbot/buildbot-0.8.12-r3.ebuild diff --git a/dev-util/buildbot/buildbot-0.9.0_rc1-r1.ebuild b/dev-util/buildbot/buildbot-0.9.0_rc1-r2.ebuild similarity index 100% rename from dev-util/buildbot/buildbot-0.9.0_rc1-r1.ebuild rename to dev-util/buildbot/buildbot-0.9.0_rc1-r2.ebuild diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd index 7997d0bff6b1..29fd444d123f 100644 --- a/dev-util/buildbot/files/buildmaster.initd +++ b/dev-util/buildbot/files/buildmaster.initd @@ -39,7 +39,7 @@ start() { ebegin "Starting buildmaster in ${BUILDMASTER_PATH}" start-stop-daemon --start -u "${USERNAME}" \ --pidfile "${BUILDMASTER_PATH}/buildmaster.pid" \ - --exec /usr/bin/python -- /usr/bin/twistd \ + --exec /usr/bin/python2 -- /usr/bin/twistd \ --no_save \ --logfile="${BUILDMASTER_PATH}/twistd.log" \ --pidfile="${BUILDMASTER_PATH}/buildmaster.pid" \ -- 2.26.2