Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 01 Oct 2020 14:07:42
Message-Id: 1601561254.1d6db64aabaa548998f60aa99acb8ce204973e54.polynomial-c@gentoo
1 commit: 1d6db64aabaa548998f60aa99acb8ce204973e54
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 1 14:02:24 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 1 14:07:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6db64a
7
8 apache-2.eclass: Mark some variables as local
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 eclass/apache-2.eclass | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
16 index 29f6edda53c..601a7fb0873 100644
17 --- a/eclass/apache-2.eclass
18 +++ b/eclass/apache-2.eclass
19 @@ -242,7 +242,7 @@ check_module_critical() {
20 # This internal function selects all built-in modules based on USE flags and
21 # APACHE2_MODULES USE_EXPAND flags
22 setup_modules() {
23 - local mod_type=
24 + local mod_type= x=
25
26 if use static ; then
27 mod_type="static"
28 @@ -328,7 +328,7 @@ setup_modules() {
29 # This internal function generates the LoadModule lines for httpd.conf based on
30 # the current module selection and MODULE_DEFINES
31 generate_load_module() {
32 - local endit=0 mod_lines= mod_dir="${ED%/}/usr/$(get_libdir)/apache2/modules"
33 + local def= endit=0 m= mod_lines= mod_dir="${ED%/}/usr/$(get_libdir)/apache2/modules"
34
35 if use static; then
36 sed -i -e "/%%LOAD_MODULE%%/d" \
37 @@ -631,6 +631,7 @@ apache-2_src_install() {
38 fi
39
40 # empty dirs
41 + local i
42 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
43 keepdir ${i}
44 fowners apache:apache ${i}