diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
| commit | b2be182d49eea46686b5cf2680d457df61e89dc4 (patch) | |
| tree | c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-util/buildbot/files | |
| parent | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff) | |
gentoo resync : 30.06.2018
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" \ |