1 |
commit: 0a098cd5685c2a28030738928c689fc6b338cf10 |
2 |
Author: Michael Seifert <mseifert <AT> error-reports <DOT> org> |
3 |
AuthorDate: Thu Mar 10 18:35:55 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 30 12:02:24 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a098cd5 |
7 |
|
8 |
dev-util/buildbot: Bumped to 0.8.12-r2. Removed 0.8.12-r1. |
9 |
|
10 |
Bumped version from 0.8.12-r1 to 0.8.12-r2, due to updated initd file. The |
11 |
initd file now supports multiple instances of buildmaster. |
12 |
|
13 |
Gentoo-Bug: https://bugs.gentoo.org/570666 |
14 |
Closes: https://github.com/gentoo/gentoo/pull/1027 |
15 |
|
16 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
17 |
|
18 |
...-0.8.12-r1.ebuild => buildbot-0.8.12-r2.ebuild} | 0 |
19 |
dev-util/buildbot/files/buildmaster.initd | 35 +++++++++++++--------- |
20 |
2 files changed, 21 insertions(+), 14 deletions(-) |
21 |
|
22 |
diff --git a/dev-util/buildbot/buildbot-0.8.12-r1.ebuild b/dev-util/buildbot/buildbot-0.8.12-r2.ebuild |
23 |
similarity index 100% |
24 |
rename from dev-util/buildbot/buildbot-0.8.12-r1.ebuild |
25 |
rename to dev-util/buildbot/buildbot-0.8.12-r2.ebuild |
26 |
|
27 |
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd |
28 |
index 313365f..39440f7 100644 |
29 |
--- a/dev-util/buildbot/files/buildmaster.initd |
30 |
+++ b/dev-util/buildbot/files/buildmaster.initd |
31 |
@@ -1,14 +1,21 @@ |
32 |
#!/sbin/runscript |
33 |
-# Copyright 1999-2013 Gentoo Foundation |
34 |
+# Copyright 1999-2016 Gentoo Foundation |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
|
37 |
extra_started_commands="reload" |
38 |
|
39 |
+BUILDMASTER_NAME=${RC_SVCNAME:12} |
40 |
+BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}" |
41 |
+ |
42 |
depend() { |
43 |
need net |
44 |
} |
45 |
|
46 |
checkconfig() { |
47 |
+ if [ -z "${BUILDMASTER_NAME}" ]; then |
48 |
+ eerror "Buildmaster name not defined. Please link buildmaster.foo to this file to start the buildmaster with the name \"foo\"." |
49 |
+ return 1 |
50 |
+ fi |
51 |
if [ -z "${BASEDIR}" ]; then |
52 |
eerror "BASEDIR not set" |
53 |
return 1 |
54 |
@@ -17,38 +24,38 @@ checkconfig() { |
55 |
eerror "USERNAME not set" |
56 |
return 1 |
57 |
fi |
58 |
- if [ ! -d "${BASEDIR}" ]; then |
59 |
- eerror "${BASEDIR} is not a directory" |
60 |
+ if [ ! -d "${BUILDMASTER_PATH}" ]; then |
61 |
+ eerror "${BUILDMASTER_PATH} is not a directory" |
62 |
return 1 |
63 |
fi |
64 |
- if [ ! -e "${BASEDIR}/buildbot.tac" ]; then |
65 |
- eerror "${BASEDIR} does not contain buildbot.tac" |
66 |
+ if [ ! -e "${BUILDMASTER_PATH}/buildbot.tac" ]; then |
67 |
+ eerror "${BUILDMASTER_PATH} does not contain buildbot.tac" |
68 |
return 1 |
69 |
fi |
70 |
} |
71 |
|
72 |
start() { |
73 |
checkconfig || return 1 |
74 |
- ebegin "Starting buildmaster in ${BASEDIR}" |
75 |
+ ebegin "Starting buildmaster in ${BUILDMASTER_PATH}" |
76 |
start-stop-daemon --start -u "${USERNAME}" \ |
77 |
- --pidfile "${BASEDIR}/buildmaster.pid" \ |
78 |
+ --pidfile "${BUILDMASTER_PATH}/buildmaster.pid" \ |
79 |
--exec /usr/bin/python -- /usr/bin/twistd \ |
80 |
--no_save \ |
81 |
- --logfile="${BASEDIR}/twistd.log" \ |
82 |
- --pidfile="${BASEDIR}/buildmaster.pid" \ |
83 |
- --python="${BASEDIR}/buildbot.tac" |
84 |
+ --logfile="${BUILDMASTER_PATH}/twistd.log" \ |
85 |
+ --pidfile="${BUILDMASTER_PATH}/buildmaster.pid" \ |
86 |
+ --python="${BUILDMASTER_PATH}/buildbot.tac" |
87 |
eend $? |
88 |
} |
89 |
|
90 |
stop() { |
91 |
- ebegin "Stopping buildmaster in ${BASEDIR}" |
92 |
- start-stop-daemon --stop --pidfile "${BASEDIR}/buildmaster.pid" |
93 |
+ ebegin "Stopping buildmaster in ${BUILDMASTER_PATH}" |
94 |
+ start-stop-daemon --stop --pidfile "${BUILDMASTER_PATH}/buildmaster.pid" |
95 |
eend $? |
96 |
} |
97 |
|
98 |
reload() { |
99 |
- ebegin "Reconfiguring buildmaster in ${BASEDIR}" |
100 |
+ ebegin "Reconfiguring buildmaster in ${BUILDMASTER_PATH}" |
101 |
start-stop-daemon --signal HUP --pidfile \ |
102 |
- "${BASEDIR}"/buildmaster.pid |
103 |
+ "${BUILDMASTER_PATH}"/buildmaster.pid |
104 |
eend $? |
105 |
} |