Gentoo Archives: gentoo-dev

From: Mikhail Koliada <zlogene@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH 1/2] pam.eclass: Support EAPI-8, add missing || die
Date: Tue, 30 Nov 2021 17:16:01
Message-Id: f25f9355-d779-d839-b4a6-6d1e2f1f0b59@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/2] pam.eclass: Support EAPI-8, add missing || die by Andreas Sturmlechner
1 On 30.11.2021 18:01, Andreas Sturmlechner wrote:
2 > Closes: https://bugs.gentoo.org/811363
3 >
4 > ---
5 > eclass/pam.eclass | 6 +++---
6 > 1 file changed, 3 insertions(+), 3 deletions(-)
7 >
8 > diff --git a/eclass/pam.eclass b/eclass/pam.eclass
9 > index 0b3421b5e7c..effd17ad55d 100644
10 > --- a/eclass/pam.eclass
11 > +++ b/eclass/pam.eclass
12 > @@ -6,14 +6,14 @@
13 > # Mikle Kolyada <zlogene@g.o>
14 > # @AUTHOR:
15 > # Diego Pettenò <flameeyes@g.o>
16 > -# @SUPPORTED_EAPIS: 5 6 7
17 > +# @SUPPORTED_EAPIS: 5 6 7 8
18 > # @BLURB: Handles pam related tasks
19 > # @DESCRIPTION:
20 > # This eclass contains functions to install pamd configuration files and
21 > # pam modules.
22 >
23 > case ${EAPI:-0} in
24 > - [567]) ;;
25 > + [5678]) ;;
26 > *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
27 > esac
28 >
29 > @@ -209,7 +209,7 @@ pamd_mimic() {
30 > cleanpamd() {
31 > while [[ -n $1 ]]; do
32 > if ! has_version sys-libs/pam; then
33 > - sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/
34 > pam.d/$1"
35 > + sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/
36 > pam.d/$1" || die
37 > fi
38 >
39 > shift
40
41
42 Actually there are few more modifications that need to be made to the
43 current code, I have this in my TODO until the end of December.