From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 11 Dec 2019 13:32:00 +0100 Subject: */*: [QA] Remove redundant `|| die` guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Since all ebuilds in the tree are EAPI>=4, `|| die` on builtin commands is redundant and dead code. Closes: https://github.com/gentoo/gentoo/pull/13940 Reviewed-by: Ulrich Müller Reviewed-by: Michał Górny Reviewed-by: Andreas K. Hüttel Signed-off-by: David Seifert --- net-print/cups/cups-2.2.12.ebuild | 2 +- net-print/cups/cups-2.3.0.ebuild | 2 +- net-print/cups/cups-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'net-print/cups') diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild index 70574c1dd3d0..972e518ff81a 100644 --- a/net-print/cups/cups-2.2.12.ebuild +++ b/net-print/cups/cups-2.2.12.ebuild @@ -265,7 +265,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild index 5d1def034fe6..46eed6927902 100644 --- a/net-print/cups/cups-2.3.0.ebuild +++ b/net-print/cups/cups-2.3.0.ebuild @@ -262,7 +262,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 5d1def034fe6..46eed6927902 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -262,7 +262,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 -- cgit v1.2.3-18-g5258