From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 574A8158086 for ; Tue, 30 Nov 2021 15:01:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C68B72BC04B; Tue, 30 Nov 2021 15:01:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EC4DE0896 for ; Tue, 30 Nov 2021 15:01:47 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 1/2] pam.eclass: Support EAPI-8, add missing || die Date: Tue, 30 Nov 2021 16:01:37 +0100 Message-ID: <20741053.4csPzL39Zc@tuxbrain> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1844044.7Z3S40VBb9"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Archives-Salt: 469fb974-e891-4809-a584-a298cc8b867a X-Archives-Hash: e3c6024c9db3155c958088531437e9af --nextPart1844044.7Z3S40VBb9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1"; protected-headers="v1" From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [PATCH 1/2] pam.eclass: Support EAPI-8, add missing || die Date: Tue, 30 Nov 2021 16:01:37 +0100 Message-ID: <20741053.4csPzL39Zc@tuxbrain> Closes: https://bugs.gentoo.org/811363 =2D-- eclass/pam.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/pam.eclass b/eclass/pam.eclass index 0b3421b5e7c..effd17ad55d 100644 =2D-- a/eclass/pam.eclass +++ b/eclass/pam.eclass @@ -6,14 +6,14 @@ # Mikle Kolyada # @AUTHOR: # Diego Petten=F2 =2D# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: Handles pam related tasks # @DESCRIPTION: # This eclass contains functions to install pamd configuration files and # pam modules. =20 case ${EAPI:-0} in =2D [567]) ;; + [5678]) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac =20 @@ -209,7 +209,7 @@ pamd_mimic() { cleanpamd() { while [[ -n $1 ]]; do if ! has_version sys-libs/pam; then =2D sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/ pam.d/$1" + sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/ pam.d/$1" || die fi =20 shift =2D-=20 2.34.1 --nextPart1844044.7Z3S40VBb9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEexlipVqzuLtTjHMOREsPlv/SLMsFAmGmPNFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDdC MTk2MkE1NUFCM0I4QkI1MzhDNzMwRTQ0NEIwRjk2RkZEMjJDQ0IACgkQREsPlv/S LMtquQgAlHUkSVQW9aC7t+VCSq1QmODzh0HuYSJIFVo3d1wX+83lT/Pi3tZ8nhjr u2uPuhe38sr+K19av1hhzUe1grYUgOoP/6DQX7K/wGE2XfIR+c6PjtKMAVbK2+vf izvbvDMKTZtweyqzh7O/GLFK6WeiVr52/PqYw4jomhR0m/A4FsKKAMpOS9brxB3U o6rKp5tUd+iuTP+yOOWdK/NFtaG772AN75xIrwbj90UJZ4V29Q+Jop3to8rq6RDW /WQEmvDufQCnbjkD2DgHO4wBzYZ71bdHaRwn/ZFINVoQ74Z5K2rwgpOCi0+6Z0YD C0iMs6bjUv9nC7jtWM4qX/AxS3ALjg== =JIJA -----END PGP SIGNATURE----- --nextPart1844044.7Z3S40VBb9--