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
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')
-rw-r--r--net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild3
-rw-r--r--net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild3
-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
-rw-r--r--net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild4
-rw-r--r--net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild2
-rw-r--r--net-print/pykota/pykota-1.26-r1.ebuild2
8 files changed, 11 insertions, 9 deletions
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
index 9e25fae9219..cbdab7f9b8c 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
@@ -77,7 +77,8 @@ src_compile() {
change_dir emake
# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
- ( cd "${S}/c3plmod_ipc" && emake ) || die
+ cd "${S}/c3plmod_ipc" || die
+ emake
}
src_install() {
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 92dd9f05754..23e5c3724b5 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -80,7 +80,8 @@ src_compile() {
change_dir emake
# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
- ( cd "${S}/c3plmod_ipc" && emake ) || die
+ cd "${S}/c3plmod_ipc" || die
+ emake
}
src_install() {
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
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
index 339b8008b67..f5dba4224b3 100644
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
@@ -47,10 +47,10 @@ src_test() {
# upstream tests are designed to be run AFTER make install, because they depend on final paths.
testroot="${T}/testroot"
mkdir -p "${testroot}"
- emake install DESTDIR="${testroot}" || die "Failed to install for testing"
+ emake install DESTDIR="${testroot}"
# -W filters is because CUPS tries really hard for secure filters: they must be root/root for the filter tests to pass
#chown root:root "${testroot}"/usr/libexec/cups/filter/{raster2dymolm,raster2dymolw} || die "failed to set ownership for tests"
# This will trigger the following warning repeatedly
#Bad permissions on cupsFilter file "..${testroot}/usr/libexec/cups/filter/raster2dymolm"
- emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters" || die "failed tests"
+ emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters"
}
diff --git a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
index 8c66696feaf..739a186c508 100644
--- a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
+++ b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild
@@ -32,7 +32,7 @@ src_install() {
inslanguage() {
if use l10n_$1; then
- doins $2/*.ppd || die "failed to install $2 ppds"
+ doins $2/*.ppd
fi
}
diff --git a/net-print/pykota/pykota-1.26-r1.ebuild b/net-print/pykota/pykota-1.26-r1.ebuild
index f7181c51816..ccab1c34b78 100644
--- a/net-print/pykota/pykota-1.26-r1.ebuild
+++ b/net-print/pykota/pykota-1.26-r1.ebuild
@@ -57,7 +57,7 @@ python_install_all() {
doins -r initscripts/*
# Fixes permissions for bug 155865
- fperms 0700 /usr/share/pykota/cupspykota || die
+ fperms 0700 /usr/share/pykota/cupspykota
rm "${ED%/}"/usr/share/doc/${PN}/{LICENSE,COPYING} || die
mv "${ED%/}"/usr/share/doc/{${PN},${PF}} || die