Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: java@g.o, Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH] java-utils-2.eclass: remove ebegin calls that lack eend calls
Date: Fri, 15 Apr 2022 14:11:34
Message-Id: 20220415141115.685441-1-floppym@gentoo.org
1 Instead, echo the command we are about to run.
2
3 Closes: https://bugs.gentoo.org/838475
4 Closes: https://bugs.gentoo.org/838478
5 Closes: https://bugs.gentoo.org/838481
6 Closes: https://bugs.gentoo.org/838487
7 Closes: https://bugs.gentoo.org/838490
8 Closes: https://bugs.gentoo.org/838493
9 Signed-off-by: Mike Gilbert <floppym@g.o>
10 ---
11 eclass/java-utils-2.eclass | 10 ++++++----
12 1 file changed, 6 insertions(+), 4 deletions(-)
13
14 diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
15 index 11798908dae..2a649942550 100644
16 --- a/eclass/java-utils-2.eclass
17 +++ b/eclass/java-utils-2.eclass
18 @@ -2099,8 +2099,9 @@ ejavac() {
19 einfo "${compiler_executable} ${javac_args} ${@}"
20 fi
21
22 - ebegin "Compiling"
23 - ${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
24 + local args=( ${compiler_executable} ${javac_args} "${@}" )
25 + echo "${args[@]}" >&2
26 + "${args[@]}" || die "ejavac failed"
27 }
28
29 # @FUNCTION: ejavadoc
30 @@ -2125,8 +2126,9 @@ ejavadoc() {
31 einfo "javadoc ${javadoc_args} ${@}"
32 fi
33
34 - ebegin "Generating JavaDoc"
35 - javadoc ${javadoc_args} "${@}" || die "ejavadoc failed"
36 + local args=( javadoc ${javadoc_args} "${@}" )
37 + echo "${args[@]}" >&2
38 + "${args[@]}" || die "ejavadoc failed"
39 }
40
41 # @FUNCTION: java-pkg_filter-compiler
42 --
43 2.35.1

Replies