Do not say "buildslave" in the buildmaster startup script. Spotted by jhmartin@toger.us (bug #153835).

Package-Manager: portage-2.1.2_rc1-r1

3 files changed, 19 insertions, 15 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index a7543f7316ec..f6ade06ea75a 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.3 2006/10/31 01:04:42 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.4 2006/11/02 20:03:49 marienz Exp $
+
+  02 Nov 2006; Marien Zwart <marienz@gentoo.org> files/buildbot.initd:
+  Do not say "buildslave" in the buildmaster startup script. Spotted by
+  jhmartin@toger.us (bug #153835).
 
   31 Oct 2006; Marien Zwart <marienz@gentoo.org> buildbot-0.7.4.ebuild:
   Add test USE flag and ~amd64 keyword.
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index ed495a9d2fc3..47712da53203 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,10 +5,10 @@ AUX buildbot-0.7.4-svn-1.4.patch 1551 RMD160 43c38ca11f1e1cb24d4f91619f2b02c3dee
 MD5 b161bc2b612cd2eb758208f570df0d95 files/buildbot-0.7.4-svn-1.4.patch 1551
 RMD160 43c38ca11f1e1cb24d4f91619f2b02c3deec2ed1 files/buildbot-0.7.4-svn-1.4.patch 1551
 SHA256 5dc4efac0c94baafb22cd102f1b8006db67d62d7a6a02a4c2c0d58cf8dd2b6d0 files/buildbot-0.7.4-svn-1.4.patch 1551
-AUX buildbot.initd 1211 RMD160 911959d36b903ebddbb97b4972adec3500755c16 SHA1 4829ccdc55d689f04cc80da9fae9b463db764834 SHA256 18795c57b46c88445d63b55c3aaeac07aea6c8763056c890a1d3f0296f924d2e
-MD5 4d945ebf3ae4130bfb2e3c1701f73841 files/buildbot.initd 1211
-RMD160 911959d36b903ebddbb97b4972adec3500755c16 files/buildbot.initd 1211
-SHA256 18795c57b46c88445d63b55c3aaeac07aea6c8763056c890a1d3f0296f924d2e files/buildbot.initd 1211
+AUX buildbot.initd 1207 RMD160 3bc054c15b8c530f8f4012026319d3f5c6264079 SHA1 1eefb47a1872b578a6b47b01c79662cb8890fa6e SHA256 0774ae5c3cfd67e537251a6e3c4bdd4bc6c948fadf7e15bd137ad977e21475fb
+MD5 b62d383ef78ce8427e2e4846a286936b files/buildbot.initd 1207
+RMD160 3bc054c15b8c530f8f4012026319d3f5c6264079 files/buildbot.initd 1207
+SHA256 0774ae5c3cfd67e537251a6e3c4bdd4bc6c948fadf7e15bd137ad977e21475fb files/buildbot.initd 1207
 AUX buildmaster.confd 218 RMD160 a8f6893aa83c0c169f493104e1c6f023ec45f787 SHA1 8dc5e868092a8ea90c0cec5650ba85e412295968 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6
 MD5 b3cd43ecb53b66433e0384ad922ffde1 files/buildmaster.confd 218
 RMD160 a8f6893aa83c0c169f493104e1c6f023ec45f787 files/buildmaster.confd 218
@@ -22,10 +22,10 @@ EBUILD buildbot-0.7.4.ebuild 2315 RMD160 3584dcbb49eed95771e39f0cb71cae5923158ac
 MD5 68bcd90d4736905b01dc85e437ed25e6 buildbot-0.7.4.ebuild 2315
 RMD160 3584dcbb49eed95771e39f0cb71cae5923158ac4 buildbot-0.7.4.ebuild 2315
 SHA256 7444478a16a9b9b884f454802e1e974b1a1319ab3bc5b19c61eb0175027dd1f4 buildbot-0.7.4.ebuild 2315
-MISC ChangeLog 893 RMD160 88d6545b901f5930f8667a0eef4e25d3d71640ef SHA1 0c5b7c0dc87939be92d62e28d1146a5d166b1724 SHA256 ec45064f4f92b3043ae06f7a60e4946470a753b9f28859f28c70fa309d49a773
-MD5 f9f573edc0a48b3eb32bb0abcc5730f4 ChangeLog 893
-RMD160 88d6545b901f5930f8667a0eef4e25d3d71640ef ChangeLog 893
-SHA256 ec45064f4f92b3043ae06f7a60e4946470a753b9f28859f28c70fa309d49a773 ChangeLog 893
+MISC ChangeLog 1072 RMD160 8d8ee4a0ff2b031ec8378ae050f777178c36b7f5 SHA1 dbde8838c2114e20868eb9d1503291b2c0280277 SHA256 23e189f2b0197e991bb8c16fccd9ffc97a4eae76c8e12324c7f33b11daa0b929
+MD5 4a2a8c0b1313ef03d01973e7e02f2c38 ChangeLog 1072
+RMD160 8d8ee4a0ff2b031ec8378ae050f777178c36b7f5 ChangeLog 1072
+SHA256 23e189f2b0197e991bb8c16fccd9ffc97a4eae76c8e12324c7f33b11daa0b929 ChangeLog 1072
 MISC metadata.xml 958 RMD160 9d7be621968219470c6fb4e66c55e91d3d7765b6 SHA1 d8a978793941a2a566dcbc9364d09e22ae54d256 SHA256 f61483b7976a1fc93cda8f8cc6d23e744f8f3ae765b385d35246be3a2ef87d76
 MD5 374d908b2008bc1082871d993dd850b8 metadata.xml 958
 RMD160 9d7be621968219470c6fb4e66c55e91d3d7765b6 metadata.xml 958
@@ -36,7 +36,7 @@ SHA256 4155c34310889f8ffb5cc8a610a6bfb7c8eeb7d13fbaf3553c963d1fd6347d96 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRqEwUElL7eJpfEQRAkt3AJ45a/+vl9pCzI4ot4noUaHZei5tIwCffRx2
-5CNiyd2XtrzqLBmTm0hSrXw=
-=mcUz
+iD8DBQFFSk8rUElL7eJpfEQRAnW+AJ9QaixZOtYcF1tghmh7eKi6jpWuLgCfVyUb
+RnUU0hS9Jof3sOncmVMgBkE=
+=pnff
 -----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/files/buildbot.initd b/dev-util/buildbot/files/buildbot.initd
index 26fe8b7902bc..bf11190b128f 100644
--- a/dev-util/buildbot/files/buildbot.initd
+++ b/dev-util/buildbot/files/buildbot.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/files/buildbot.initd,v 1.1 2006/09/25 17:42:37 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/files/buildbot.initd,v 1.2 2006/11/02 20:03:49 marienz Exp $
 
 depend() {
 	need net
@@ -28,7 +28,7 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting buildslave in ${BASEDIR}"
+	ebegin "Starting buildbot in ${BASEDIR}"
 	# We set HOME here to make something valid show up in the env of child
 	# processes spawned by the buildslave.
 	start-stop-daemon --start -c "${USERNAME}" --quiet \
@@ -42,7 +42,7 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping buildslave in ${BASEDIR}"
+	ebegin "Stopping buildbot in ${BASEDIR}"
 	start-stop-daemon --stop --quiet --pidfile "${BASEDIR}/twistd.pid"
 	eend $?
 }