Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/
Date: Sun, 11 Aug 2019 11:20:55
Message-Id: 1565522423.749f1e506f33dbd0a1563df68848e51e6fcb93de.soap@gentoo
1 commit: 749f1e506f33dbd0a1563df68848e51e6fcb93de
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 11:20:23 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 11:20:23 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749f1e50
7
8 sys-apps/openrc: [QA] Fix missing trailing slash
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sys-apps/openrc/openrc-9999.ebuild | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
16 diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
17 index 891a73480c4..6bf7ded639b 100644
18 --- a/sys-apps/openrc/openrc-9999.ebuild
19 +++ b/sys-apps/openrc/openrc-9999.ebuild
20 @@ -159,10 +159,10 @@ src_install() {
21
22 pkg_preinst() {
23 # avoid default thrashing in conf.d files when possible #295406
24 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
25 + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
26 (
27 unset hostname HOSTNAME
28 - source "${EROOT}"etc/conf.d/hostname
29 + source "${EROOT}"/etc/conf.d/hostname
30 : ${hostname:=${HOSTNAME}}
31 [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
32 )
33 @@ -183,11 +183,11 @@ pkg_postinst() {
34 # Added for 0.35.
35 if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
36 if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
37 - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
38 + cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"/lib
39 fi
40 elif ! use kernel_linux; then
41 if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
42 - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
43 + cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"/lib
44 fi
45 fi
46
47 @@ -202,7 +202,7 @@ pkg_postinst() {
48 ewarn
49 fi
50
51 - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
52 + if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
53 ewarn "Please add the network service to your boot runlevel"
54 ewarn "as soon as possible. Not doing so could leave you with a system"
55 ewarn "without networking."