| 1 |
commit: 05bbb798e8ac3c353a9677525a8aaddf7e936b22 |
| 2 |
Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz> |
| 3 |
AuthorDate: Fri Apr 29 09:24:34 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 20:03:38 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bbb798 |
| 7 |
|
| 8 |
app-misc/g15daemon: [QA] properly close ebegin with eend |
| 9 |
|
| 10 |
Each ebuild had two instances of ebegin w/o a closing eend. In one case, |
| 11 |
just add the missing eend, there's an error code can be used. In the |
| 12 |
other case, change the ebegin to einfo. |
| 13 |
|
| 14 |
Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/25254 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild | 5 +++-- |
| 19 |
app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild | 5 +++-- |
| 20 |
app-misc/g15daemon/g15daemon-9999.ebuild | 5 +++-- |
| 21 |
3 files changed, 9 insertions(+), 6 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild |
| 24 |
index 407950bcbb25..fcec05306914 100644 |
| 25 |
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild |
| 26 |
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2020 Gentoo Authors |
| 29 |
+# Copyright 1999-2022 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
EAPI=7 |
| 33 |
@@ -38,6 +38,7 @@ uinput_check() { |
| 34 |
local rc=1 |
| 35 |
linux_config_exists && linux_chkconfig_present INPUT_UINPUT |
| 36 |
rc=$? |
| 37 |
+ eend ${rc} |
| 38 |
|
| 39 |
if [[ ${rc} -ne 0 ]] ; then |
| 40 |
eerror "To use g15daemon, you need to compile your kernel with uinput support." |
| 41 |
@@ -126,7 +127,7 @@ src_install() { |
| 42 |
doexe "${FILESDIR}"/20g15daemon |
| 43 |
|
| 44 |
if use perl ; then |
| 45 |
- ebegin "Installing Perl Bindings (G15Daemon.pm)" |
| 46 |
+ einfo "Installing Perl Bindings (G15Daemon.pm)" |
| 47 |
cd "${WORKDIR}/G15Daemon-0.2" || die |
| 48 |
docinto perl |
| 49 |
perl-module_src_install |
| 50 |
|
| 51 |
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild |
| 52 |
index 2042898ab06a..abd8cf26fdb9 100644 |
| 53 |
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild |
| 54 |
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild |
| 55 |
@@ -1,4 +1,4 @@ |
| 56 |
-# Copyright 1999-2020 Gentoo Authors |
| 57 |
+# Copyright 1999-2022 Gentoo Authors |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
EAPI=7 |
| 61 |
@@ -38,6 +38,7 @@ uinput_check() { |
| 62 |
local rc=1 |
| 63 |
linux_config_exists && linux_chkconfig_present INPUT_UINPUT |
| 64 |
rc=$? |
| 65 |
+ eend ${rc} |
| 66 |
|
| 67 |
if [[ ${rc} -ne 0 ]] ; then |
| 68 |
eerror "To use g15daemon, you need to compile your kernel with uinput support." |
| 69 |
@@ -127,7 +128,7 @@ src_install() { |
| 70 |
doexe "${FILESDIR}"/20g15daemon |
| 71 |
|
| 72 |
if use perl ; then |
| 73 |
- ebegin "Installing Perl Bindings (G15Daemon.pm)" |
| 74 |
+ einfo "Installing Perl Bindings (G15Daemon.pm)" |
| 75 |
cd "${WORKDIR}/G15Daemon-0.2" || die |
| 76 |
docinto perl |
| 77 |
perl-module_src_install |
| 78 |
|
| 79 |
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild |
| 80 |
index 71c34ecf83b2..472d44a00535 100644 |
| 81 |
--- a/app-misc/g15daemon/g15daemon-9999.ebuild |
| 82 |
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild |
| 83 |
@@ -1,4 +1,4 @@ |
| 84 |
-# Copyright 1999-2020 Gentoo Authors |
| 85 |
+# Copyright 1999-2022 Gentoo Authors |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=7 |
| 89 |
@@ -39,6 +39,7 @@ uinput_check() { |
| 90 |
local rc=1 |
| 91 |
linux_config_exists && linux_chkconfig_present INPUT_UINPUT |
| 92 |
rc=$? |
| 93 |
+ eend ${rc} |
| 94 |
|
| 95 |
if [[ ${rc} -ne 0 ]] ; then |
| 96 |
eerror "To use g15daemon, you need to compile your kernel with uinput support." |
| 97 |
@@ -137,7 +138,7 @@ src_install() { |
| 98 |
doexe "${FILESDIR}"/20g15daemon |
| 99 |
|
| 100 |
if use perl ; then |
| 101 |
- ebegin "Installing Perl Bindings (G15Daemon.pm)" |
| 102 |
+ einfo "Installing Perl Bindings (G15Daemon.pm)" |
| 103 |
cd "${WORKDIR}/G15Daemon-0.2" || die |
| 104 |
docinto perl |
| 105 |
perl-module_src_install |
Archives