diff options
author | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
commit | 398a42634f34afa1979d88ae1d8b38194e911c2d (patch) | |
tree | d6a45bdf7b35b71c192602a46e8d98d12a88cb02 /net-nds | |
parent | dev-ros/geometric_shapes: Remove old (diff) | |
download | gentoo-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-nds')
-rw-r--r-- | net-nds/jxplorer/jxplorer-3.3.1.1.ebuild | 2 | ||||
-rw-r--r-- | net-nds/jxplorer/jxplorer-3.3.1.2.ebuild | 2 | ||||
-rw-r--r-- | net-nds/jxplorer/jxplorer-3.3.1.ebuild | 2 | ||||
-rw-r--r-- | net-nds/openldap/openldap-2.4.45.ebuild | 2 | ||||
-rw-r--r-- | net-nds/openldap/openldap-2.4.48.ebuild | 2 | ||||
-rw-r--r-- | net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild | 5 | ||||
-rw-r--r-- | net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild | 5 | ||||
-rw-r--r-- | net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild | 5 |
8 files changed, 11 insertions, 14 deletions
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild index bbbcea98f709..1e9182ed85aa 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild @@ -51,7 +51,7 @@ src_install() { insinto /usr/share/${PN} doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - dodoc README*.TXT || die + dodoc README*.TXT # By default the config dir is ${HOME}/jxplorer java-pkg_dolauncher ${PN} \ diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild index 24b83acf99b6..161a2fe5f6cc 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild @@ -58,7 +58,7 @@ src_install() { insinto /usr/share/${PN} doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - dodoc README*.TXT || die + dodoc README*.TXT # By default the config dir is ${HOME}/jxplorer java-pkg_dolauncher ${PN} \ diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild index 4ad7b4dfb867..0ee4964b2fe2 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.ebuild @@ -51,7 +51,7 @@ src_install() { insinto /usr/share/${PN} doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - dodoc README*.TXT || die + dodoc README*.TXT # By default the config dir is ${HOME}/jxplorer java-pkg_dolauncher ${PN} \ diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild index 344d168105b3..04e0c6793983 100644 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ b/net-nds/openldap/openldap-2.4.45.ebuild @@ -703,7 +703,7 @@ multilib_src_compile() { multilib_src_test() { if multilib_is_native_abi; then cd tests || die - emake tests || die "make tests failed" + emake tests fi } diff --git a/net-nds/openldap/openldap-2.4.48.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild index ba833c3f7a0a..36678c333b5d 100644 --- a/net-nds/openldap/openldap-2.4.48.ebuild +++ b/net-nds/openldap/openldap-2.4.48.ebuild @@ -720,7 +720,7 @@ multilib_src_compile() { multilib_src_test() { if multilib_is_native_abi; then cd tests || die - emake tests || die "make tests failed" + emake tests fi } diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild index 7fe26ccea4b6..0bb83adc7821 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild @@ -37,12 +37,11 @@ src_configure() { $(use_enable debug) \ $(use_enable finger) \ $(use_enable maxsess) \ - $(use_enable static-libs static) \ - || die "econf failed" + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" dodoc CHANGES FAQ diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild index dfb57ee97661..f94caec0a181 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild @@ -40,12 +40,11 @@ src_configure() { $(use_enable debug) \ $(use_enable finger) \ $(use_enable maxsess) \ - $(use_enable static-libs static) \ - || die "econf failed" + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" dodoc CHANGES FAQ diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild index fc1a2ef19e67..710eeb83ce89 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild @@ -41,12 +41,11 @@ src_configure() { $(use_enable debug) \ $(use_enable finger) \ $(use_enable maxsess) \ - $(use_enable static-libs static) \ - || die "econf failed" + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" dodoc CHANGES FAQ |