diff options
| author |   Michael Seifert <mseifert@error-reports.org> | 2016-03-10 19:35:55 +0100 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-03-30 12:02:24 +0000 |
| commit | 0a098cd5685c2a28030738928c689fc6b338cf10 (patch) | |
| tree | fe271c4783ed25a103454b89e7c28cf1914d31e4 /dev-util/buildbot/files | |
| parent | app-crypt/gnupg: loosen up clang check, bug #577254 (diff) | |
| download | gentoo-0a098cd5685c2a28030738928c689fc6b338cf10.tar.gz gentoo-0a098cd5685c2a28030738928c689fc6b338cf10.tar.bz2 gentoo-0a098cd5685c2a28030738928c689fc6b338cf10.zip | |
dev-util/buildbot: Bumped to 0.8.12-r2. Removed 0.8.12-r1.
Bumped version from 0.8.12-r1 to 0.8.12-r2, due to updated initd file. The
initd file now supports multiple instances of buildmaster.
Gentoo-Bug: https://bugs.gentoo.org/570666
Closes: https://github.com/gentoo/gentoo/pull/1027
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-util/buildbot/files')
| -rw-r--r-- | dev-util/buildbot/files/buildmaster.initd | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd index 313365f3a676..39440f7655d4 100644 --- a/dev-util/buildbot/files/buildmaster.initd +++ b/dev-util/buildbot/files/buildmaster.initd @@ -1,14 +1,21 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" +BUILDMASTER_NAME=${RC_SVCNAME:12} +BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}" + depend() { need net } checkconfig() { + if [ -z "${BUILDMASTER_NAME}" ]; then + eerror "Buildmaster name not defined. Please link buildmaster.foo to this file to start the buildmaster with the name \"foo\"." + return 1 + fi if [ -z "${BASEDIR}" ]; then eerror "BASEDIR not set" return 1 @@ -17,38 +24,38 @@ checkconfig() { eerror "USERNAME not set" return 1 fi - if [ ! -d "${BASEDIR}" ]; then - eerror "${BASEDIR} is not a directory" + if [ ! -d "${BUILDMASTER_PATH}" ]; then + eerror "${BUILDMASTER_PATH} is not a directory" return 1 fi - if [ ! -e "${BASEDIR}/buildbot.tac" ]; then - eerror "${BASEDIR} does not contain buildbot.tac" + if [ ! -e "${BUILDMASTER_PATH}/buildbot.tac" ]; then + eerror "${BUILDMASTER_PATH} does not contain buildbot.tac" return 1 fi } start() { checkconfig || return 1 - ebegin "Starting buildmaster in ${BASEDIR}" + ebegin "Starting buildmaster in ${BUILDMASTER_PATH}" start-stop-daemon --start -u "${USERNAME}" \ - --pidfile "${BASEDIR}/buildmaster.pid" \ + --pidfile "${BUILDMASTER_PATH}/buildmaster.pid" \ --exec /usr/bin/python -- /usr/bin/twistd \ --no_save \ - --logfile="${BASEDIR}/twistd.log" \ - --pidfile="${BASEDIR}/buildmaster.pid" \ - --python="${BASEDIR}/buildbot.tac" + --logfile="${BUILDMASTER_PATH}/twistd.log" \ + --pidfile="${BUILDMASTER_PATH}/buildmaster.pid" \ + --python="${BUILDMASTER_PATH}/buildbot.tac" eend $? } stop() { - ebegin "Stopping buildmaster in ${BASEDIR}" - start-stop-daemon --stop --pidfile "${BASEDIR}/buildmaster.pid" + ebegin "Stopping buildmaster in ${BUILDMASTER_PATH}" + start-stop-daemon --stop --pidfile "${BUILDMASTER_PATH}/buildmaster.pid" eend $? } reload() { - ebegin "Reconfiguring buildmaster in ${BASEDIR}" + ebegin "Reconfiguring buildmaster in ${BUILDMASTER_PATH}" start-stop-daemon --signal HUP --pidfile \ - "${BASEDIR}"/buildmaster.pid + "${BUILDMASTER_PATH}"/buildmaster.pid eend $? } |