Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/
Date: Wed, 13 May 2020 20:48:27
Message-Id: 1589402571.59b916643e4cac8699e351913ac721823154c0fa.dolsen@gentoo
1 commit: 59b916643e4cac8699e351913ac721823154c0fa
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 13 20:42:51 2020 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Wed May 13 20:42:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b91664
7
8 dev-util/buildbot: Set correct permissions in pkg_config
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
12
13 dev-util/buildbot/buildbot-2.7.0.ebuild | 4 +++-
14 dev-util/buildbot/buildbot-9999.ebuild | 4 +++-
15 2 files changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild
18 index 1769ba6f1d1..01fd9b60949 100644
19 --- a/dev-util/buildbot/buildbot-2.7.0.ebuild
20 +++ b/dev-util/buildbot/buildbot-2.7.0.ebuild
21 @@ -173,7 +173,7 @@ pkg_config() {
22 mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
23 fi
24 "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
25 - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
26 + chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
27 mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
28 || die "Moving sample configuration failed"
29 ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
30 @@ -181,6 +181,8 @@ pkg_config() {
31
32 if [[ ! -d "${instance_log_path}" ]]; then
33 mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
34 + chown --recursive buildbot:buildbot "${instance_log_path}" \
35 + || die "Setting permissions for instance failed"
36 fi
37 ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
38 || die "Unable to create link to log file"
39
40 diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
41 index cdce9bbe8ff..35a2e69c15e 100644
42 --- a/dev-util/buildbot/buildbot-9999.ebuild
43 +++ b/dev-util/buildbot/buildbot-9999.ebuild
44 @@ -201,7 +201,7 @@ pkg_config() {
45 mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
46 fi
47 "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
48 - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
49 + chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
50 mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
51 || die "Moving sample configuration failed"
52 ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
53 @@ -209,6 +209,8 @@ pkg_config() {
54
55 if [[ ! -d "${instance_log_path}" ]]; then
56 mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
57 + chown --recursive buildbot:buildbot "${instance_log_path}" \
58 + || die "Setting permissions for instance failed"
59 fi
60 ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
61 || die "Unable to create link to log file"