summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
commit398a42634f34afa1979d88ae1d8b38194e911c2d (patch)
treed6a45bdf7b35b71c192602a46e8d98d12a88cb02 /net-print/cups
parentdev-ros/geometric_shapes: Remove old (diff)
downloadgentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.gz
gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.bz2
gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.zip
*/*: [QA] Remove redundant `|| die` guards
* 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 <ulm@gentoo.org> Reviewed-by: Michał Górny <mgorny@gentoo.org> Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/cups-2.2.12.ebuild2
-rw-r--r--net-print/cups/cups-2.3.0.ebuild2
-rw-r--r--net-print/cups/cups-9999.ebuild2
3 files changed, 3 insertions, 3 deletions
diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild
index 70574c1dd3d..972e518ff81 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 5d1def034fe..46eed692790 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 5d1def034fe..46eed692790 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