[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     edf6c090d349e069ac8e6b83a2bf0826defa06c3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 20:05:00 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 20:05:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf6c090

dev-util/buildbot-worker: Fix conf.d and init.d filenames

The last two releases mistakenly installed the conf.d and init.d files using the old buildslave
name.  The 9999 ebuild had not been properly updated to the new buildbot_worker name.
As a result the 0.9.2 and 0.9.3 releases were installing them as buildslave.
This caused problems in downstream installations/scripts expecting the init script to be
named "buildbot_worker".

Package-Manager: Portage-2.3.3_p23, Repoman-2.3.1_p16

 ...ildbot-worker-0.9.2.ebuild => buildbot-worker-0.9.2-r1.ebuild} | 8 ++++++--
 ...ildbot-worker-0.9.3.ebuild => buildbot-worker-0.9.3-r1.ebuild} | 7 +++++--
 dev-util/buildbot-worker/buildbot-worker-9999.ebuild              | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild
similarity index 83%
rename from dev-util/buildbot-worker/buildbot-worker-0.9.2.ebuild
rename to dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild
index 89a5735..5fd1173 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild
@@ -79,12 +79,16 @@ python_install_all() {
 
 	doman docs/buildbot-worker.1
 
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildslave
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildslave
+	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
 
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	ewarn "The 0.9.2 and 0.9.3 original ebuilds had a mistake naming the"
+	ewarn "conf.d and init.d files as 'buildslave', when it should have been"
+	ewarn "'buildbot_worker' as it is in the previous 0.9 versions."
+	ewarn "Only the 0.8 and previous versions should use the name 'buildslave'"
 }

diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.3.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild
similarity index 84%
rename from dev-util/buildbot-worker/buildbot-worker-0.9.3.ebuild
rename to dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild
index 884c2ed..a34b7d5 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.3.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild
@@ -66,12 +66,15 @@ python_install_all() {
 
 	doman docs/buildbot-worker.1
 
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildslave
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildslave
+	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
 
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+	ewarn "conf.d and init.d files as 'buildslave', when it should have been"
+	ewarn "'buildbot_worker' as it is in the previous 0.9 versions."
+	ewarn "Only the 0.8 and previous versions should use the name 'buildslave'"
 }

diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index ed5fdcf..ad4b6a8 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -66,8 +66,8 @@ python_install_all() {
 
 	doman docs/buildbot-worker.1
 
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildslave
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildslave
+	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
 
 	readme.gentoo_create_doc
 }