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

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 89a5735e0c7f6752f8bc407460afae5bb103e40e..5fd1173c5d18b0fb046d21e46b428f9595a35259 100644 (file)
--- 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 884c2edd22ca8aaab8d581ce505553f91908ef6e..a34b7d5153c663aefbed02ee8f9dcd6b12a6ad49 100644 (file)
--- 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 ed5fdcfc1bc778a8356eefdaa6faeb8accd81e0b..ad4b6a8fe7b68c3f4927c101ef33e8a0f60ccc5b 100644 (file)
--- 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
 }