Skip to content

Commit

Permalink
dev-util/buildbot-worker: Fix conf.d and init.d filenames
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dol-sen committed Jan 19, 2017
1 parent bb03053 commit edf6c09
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
}
4 changes: 2 additions & 2 deletions dev-util/buildbot-worker/buildbot-worker-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit edf6c09

Please sign in to comment.