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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E08D1382C5 for ; Wed, 14 Apr 2021 23:11:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F9E6E08A8; Wed, 14 Apr 2021 23:11:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26399E089A for ; Wed, 14 Apr 2021 23:11:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2DAC34095A for ; Wed, 14 Apr 2021 23:11:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38F3D64B for ; Wed, 14 Apr 2021 23:11:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618441874.a285cdf29fb8948bb736b3b8d2c6e83ef382ce7d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a285cdf29fb8948bb736b3b8d2c6e83ef382ce7d X-VCS-Branch: master Date: Wed, 14 Apr 2021 23:11:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d2c4caa-dd5c-4946-a199-9a63947f3188 X-Archives-Hash: 7afa2b04ddb81507bfa460151540edb0 commit: a285cdf29fb8948bb736b3b8d2c6e83ef382ce7d Author: Sam James gentoo org> AuthorDate: Fri Apr 2 14:45:38 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 14 23:11:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a285cdf2 sys-fs/zfs: use consistent 9999 test throughout, unify style Signed-off-by: Sam James gentoo.org> sys-fs/zfs/zfs-9999.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index ecae293cb14..fbce8715910 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -11,7 +11,7 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam sy DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="https://github.com/openzfs/zfs" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == "9999" ]]; then inherit git-r3 linux-mod EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else @@ -19,7 +19,7 @@ else SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" S="${WORKDIR}/${P%_rc?}" - if [[ ${PV} != *_rc* ]] ; then + if [[ ${PV} != *_rc* ]]; then KEYWORDS="~amd64 ~arm64 ~ppc64" fi fi @@ -86,7 +86,7 @@ pkg_setup() { if use kernel_linux && use test-suite; then linux-info_pkg_setup - if ! linux_config_exists; then + if ! linux_config_exists; then ewarn "Cannot check the linux kernel configuration." else if use test-suite; then @@ -176,7 +176,7 @@ src_install() { use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } if ! use static-libs; then - find "${ED}/" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die fi dobashcomp contrib/bash_completion.d/zfs @@ -198,14 +198,14 @@ src_install() { pkg_postinst() { if use rootfs; then if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "root on zfs requires initramfs to boot" - elog "the following packages known to provide one and tested on regular basis:" + elog "Root on zfs requires an initramfs to boot" + elog "The following packages provide one and are tested on a regular basis:" elog " sys-kernel/dracut" elog " sys-kernel/genkernel" fi fi - if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then einfo "Adding ${P} to the module database to ensure that the" einfo "kernel modules and userland utilities stay in sync." update_moduledb