commit: 4bae926c9db220134ecffa322ad39c8a29bc2ff9 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Dec 10 04:44:38 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Dec 10 05:10:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bae926c
x11-drivers/nvidia-drivers: replace assert with pipestatus Not interesting to show pipestatus -v when the 2nd command is an ebuild internal and will die on its own if failed. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild | 7 ++++--- x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild | 7 ++++--- x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild | 7 ++++--- x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild | 5 +++-- x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild | 5 +++-- x11-drivers/nvidia-drivers/nvidia-drivers-550.40.81.ebuild | 5 +++-- x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild | 5 +++-- x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild | 5 +++-- 8 files changed, 27 insertions(+), 19 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild index ef1d957c063a..c9d1e9d417bd 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild @@ -4,8 +4,8 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 -inherit systemd toolchain-funcs unpacker user-info +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 multilib +inherit readme.gentoo-r1 systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.1 NV_URI="https://download.nvidia.com/XFree86/"; @@ -342,7 +342,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GLX_MODULE_SYMLINK|XMODULE_NEWSYM) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild index 54648a15bfe3..4db46f5d0f08 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild @@ -4,8 +4,8 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 -inherit systemd toolchain-funcs unpacker user-info +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 multilib +inherit readme.gentoo-r1 systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.6 NV_URI="https://download.nvidia.com/XFree86/"; @@ -312,7 +312,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild index d8723f5691d5..cb2c2fbab09f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild @@ -4,8 +4,8 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 -inherit systemd toolchain-funcs unpacker user-info +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 multilib +inherit readme.gentoo-r1 systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.12 NV_URI="https://download.nvidia.com/XFree86/"; @@ -375,7 +375,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild index 16ff0bb4009d..028c5a8e171b 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.12 @@ -367,7 +367,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild index 490ae39a23d0..c1a0d5521864 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.12 @@ -371,7 +371,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.81.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.81.ebuild index b0093698b982..aff518c359eb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.81.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.81.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.11 @@ -369,7 +369,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild index aa6c1c5a6c4e..19effc3aca28 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.12 @@ -376,7 +376,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild index dfaa0bc00c62..f95de3f867f4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.77.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_IUSE=+modules -inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 +inherit desktop eapi9-pipestatus flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info MODULES_KERNEL_MAX=6.12 @@ -380,7 +380,8 @@ documentation that is installed alongside this README." case ${m[2]} in MANPAGE) - gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert + gzip -dc ${m[0]} | newman - ${m[0]%.gz} + pipestatus || die continue ;; GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
