Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass
Date: Sun, 27 Apr 2014 18:58:12
Message-Id: 20140427185807.D90642004B@flycatcher.gentoo.org
1 vapier 14/04/27 18:58:07
2
3 Modified: eutils.eclass
4 Log:
5 optfeature: fix eclass doc and style #498988
6
7 Revision Changes Path
8 1.433 eclass/eutils.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.433&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.433&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.432&r2=1.433
13
14 Index: eutils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
17 retrieving revision 1.432
18 retrieving revision 1.433
19 diff -u -r1.432 -r1.433
20 --- eutils.eclass 15 Mar 2014 00:47:42 -0000 1.432
21 +++ eutils.eclass 27 Apr 2014 18:58:07 -0000 1.433
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2013 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.432 2014/03/15 00:47:42 creffett Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.433 2014/04/27 18:58:07 vapier Exp $
27
28 # @ECLASS: eutils.eclass
29 # @MAINTAINER:
30 @@ -1738,11 +1738,11 @@
31 # The following snippet would suggest app-misc/foo for optional foo support,
32 # app-misc/bar or app-misc/baz[bar] for optional bar support
33 # and either both app-misc/a and app-misc/b or app-misc/c for alphabet support.
34 -# @CODE:
35 -# optfeature "foo support" app-misc/foo
36 -# optfeature "bar support" app-misc/bar app-misc/baz[bar]
37 -# optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
38 -#
39 +# @CODE
40 +# optfeature "foo support" app-misc/foo
41 +# optfeature "bar support" app-misc/bar app-misc/baz[bar]
42 +# optfeature "alphabet support" "app-misc/a app-misc/b" app-misc/c
43 +# @CODE
44 optfeature() {
45 debug-print-function ${FUNCNAME} "$@"
46 local i j msg
47 @@ -1750,23 +1750,23 @@
48 local flag=0
49 shift
50 for i; do
51 - for j in $i; do
52 - if has_version "$j"; then
53 + for j in ${i}; do
54 + if has_version "${j}"; then
55 flag=1
56 else
57 flag=0
58 break
59 fi
60 done
61 - if [[ $flag -eq 1 ]]; then
62 + if [[ ${flag} -eq 1 ]]; then
63 break
64 fi
65 done
66 - if [[ $flag -eq 0 ]]; then
67 + if [[ ${flag} -eq 0 ]]; then
68 for i; do
69 msg=" "
70 - for j in $i; do
71 - msg="${msg} ${j} and"
72 + for j in ${i}; do
73 + msg+=" ${j} and"
74 done
75 msg="${msg:0: -4} for ${desc}"
76 elog "${msg}"