diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2018-06-17 03:33:03 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2018-06-27 08:24:11 -0700 |
| commit | 2e402f7f0de545cd4277d95650d48d832fa2ca67 (patch) | |
| tree | bad6d99240d0445884c4f2b16ef3184877b98830 /dev-util/buildbot/files | |
| parent | dev-python/blockdiag: Add undocumented configparser dep for python-2.7 (diff) | |
| download | gentoo-2e402f7f0de545cd4277d95650d48d832fa2ca67.tar.gz gentoo-2e402f7f0de545cd4277d95650d48d832fa2ca67.tar.bz2 gentoo-2e402f7f0de545cd4277d95650d48d832fa2ca67.zip | |
dev-util/buildbot: Version bump, removed doc use flag
Docs generation has been broken last several versions,
blockdiag dep is failing tests.
Bump EAPI.
Add RUNTIME_PYTHON setting in /etc/conf.d/buildbot to
control the desired python version used.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-util/buildbot/files')
| -rw-r--r-- | dev-util/buildbot/files/buildmaster.confd | 5 | ||||
| -rw-r--r-- | dev-util/buildbot/files/buildmaster.initd | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd index e489d66f9d4b..eb3185aef358 100644 --- a/dev-util/buildbot/files/buildmaster.confd +++ b/dev-util/buildbot/files/buildmaster.confd @@ -8,3 +8,8 @@ USERNAME=buildbot # Extra options to pass to twistd. TWISTD_OPTS="" + +# Optional specific python version to run in +# (if not the system default version) +# ie: RUNTIME_PYTHON="/usr/bin/python2.7" +RUNTIME_PYTHON="" diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd index 29fd444d123f..933c6e2b4e51 100644 --- a/dev-util/buildbot/files/buildmaster.initd +++ b/dev-util/buildbot/files/buildmaster.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" @@ -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/python2 -- /usr/bin/twistd \ + --exec "${RUNTIME_PYTHON}" -- /usr/bin/twistd \ --no_save \ --logfile="${BUILDMASTER_PATH}/twistd.log" \ --pidfile="${BUILDMASTER_PATH}/buildmaster.pid" \ |