commit: 282d9a279140d8251115672e2ac454707721f03a
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 15:23:15 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 20:02:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=282d9a27
dev-util/buildbot: Improve pkg_config in latest releases
Fix missed edit in previous commit.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-util/buildbot/buildbot-0.9.10.ebuild | 2 +-
dev-util/buildbot/buildbot-0.9.11.ebuild | 10 ++++++++++
dev-util/buildbot/buildbot-9999.ebuild | 10 ++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/dev-util/buildbot/buildbot-0.9.10.ebuild
b/dev-util/buildbot/buildbot-0.9.10.ebuild
index 65f5d4a7138..0f493ccb8ff 100644
--- a/dev-util/buildbot/buildbot-0.9.10.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.10.ebuild
@@ -171,7 +171,7 @@ pkg_postinst() {
pkg_config() {
local buildmaster_path="/var/lib/buildmaster"
- local log_path="/var/log/buildbot_worker"
+ local log_path="/var/log/buildmaster"
einfo "This will prepare a new buildmaster instance in
${buildmaster_path}."
einfo "Press Control-C to abort."
diff --git a/dev-util/buildbot/buildbot-0.9.11.ebuild
b/dev-util/buildbot/buildbot-0.9.11.ebuild
index dbb4358a838..694b31c8f11 100644
--- a/dev-util/buildbot/buildbot-0.9.11.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.11.ebuild
@@ -162,6 +162,8 @@ pkg_postinst() {
pkg_config() {
local buildmaster_path="/var/lib/buildmaster"
+ local log_path="/var/log/buildmaster"
+
einfo "This will prepare a new buildmaster instance in
${buildmaster_path}."
einfo "Press Control-C to abort."
@@ -170,6 +172,8 @@ pkg_config() {
[[ -z "${instance_name}" ]] && die "Invalid instance name"
local instance_path="${buildmaster_path}/${instance_name}"
+ local instance_log_path="${log_path}/${instance_name}"
+
if [[ -e "${instance_path}" ]]; then
eerror "The instance with the specified name already exists:"
eerror "${instance_path}"
@@ -187,6 +191,12 @@ pkg_config() {
ln --symbolic --relative "/etc/init.d/buildmaster"
"/etc/init.d/buildmaster.${instance_name}" \
|| die "Unable to create link to init file"
+ if [[ ! -d "${instance_log_path}" ]]; then
+ mkdir --parents "${instance_log_path}" || die "Unable to create
directory ${instance_log_path}"
+ fi
+ ln --symbolic --relative "${instance_log_path}/twistd.log"
"${instance_path}/twistd.log" \
+ || die "Unable to create link to log file"
+
einfo "Successfully created a buildmaster instance at ${instance_path}."
einfo "To change the default settings edit the master.cfg file in this
directory."
}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild
b/dev-util/buildbot/buildbot-9999.ebuild
index dbb4358a838..694b31c8f11 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -162,6 +162,8 @@ pkg_postinst() {
pkg_config() {
local buildmaster_path="/var/lib/buildmaster"
+ local log_path="/var/log/buildmaster"
+
einfo "This will prepare a new buildmaster instance in
${buildmaster_path}."
einfo "Press Control-C to abort."
@@ -170,6 +172,8 @@ pkg_config() {
[[ -z "${instance_name}" ]] && die "Invalid instance name"
local instance_path="${buildmaster_path}/${instance_name}"
+ local instance_log_path="${log_path}/${instance_name}"
+
if [[ -e "${instance_path}" ]]; then
eerror "The instance with the specified name already exists:"
eerror "${instance_path}"
@@ -187,6 +191,12 @@ pkg_config() {
ln --symbolic --relative "/etc/init.d/buildmaster"
"/etc/init.d/buildmaster.${instance_name}" \
|| die "Unable to create link to init file"
+ if [[ ! -d "${instance_log_path}" ]]; then
+ mkdir --parents "${instance_log_path}" || die "Unable to create
directory ${instance_log_path}"
+ fi
+ ln --symbolic --relative "${instance_log_path}/twistd.log"
"${instance_path}/twistd.log" \
+ || die "Unable to create link to log file"
+
einfo "Successfully created a buildmaster instance at ${instance_path}."
einfo "To change the default settings edit the master.cfg file in this
directory."
}
