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-ftp | |
| 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-ftp')
| -rw-r--r-- | net-ftp/ftpbase/ftpbase-0.01-r3.ebuild | 2 | ||||
| -rw-r--r-- | net-ftp/tnftp/tnftp-20141104.ebuild | 7 | ||||
| -rw-r--r-- | net-ftp/tnftp/tnftp-20151004.ebuild | 7 | ||||
| -rw-r--r-- | net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 6 |
4 files changed, 10 insertions, 12 deletions
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild index e6aa6b99df8c..54fd9199f7a6 100644 --- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild +++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild @@ -28,7 +28,7 @@ src_install() { # The ftpusers file is a list of people who are NOT allowed # to use the ftp service. insinto /etc - doins "${FILESDIR}/ftpusers" || die + doins "${FILESDIR}/ftpusers" cp "${FILESDIR}/ftp-pamd-include" "${T}" || die if use elibc_FreeBSD; then diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild index d36fa9f33364..b8180b5c2ab6 100644 --- a/net-ftp/tnftp/tnftp-20141104.ebuild +++ b/net-ftp/tnftp/tnftp-20141104.ebuild @@ -21,11 +21,10 @@ src_configure() { econf \ --enable-editcomplete \ $(use_enable ipv6) \ - $(use_with socks5 socks) \ - || die "econf failed" + $(use_with socks5 socks) } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc ChangeLog README THANKS || die "dodoc failed" + emake install DESTDIR="${D}" + dodoc ChangeLog README THANKS } diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild index c39d0e1b907c..fff01fa2c0b8 100644 --- a/net-ftp/tnftp/tnftp-20151004.ebuild +++ b/net-ftp/tnftp/tnftp-20151004.ebuild @@ -21,11 +21,10 @@ src_configure() { econf \ --enable-editcomplete \ $(use_enable ipv6) \ - $(use_with socks5 socks) \ - || die "econf failed" + $(use_with socks5 socks) } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc ChangeLog README THANKS || die "dodoc failed" + emake install DESTDIR="${D}" + dodoc ChangeLog README THANKS } diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild index 6559c9946105..361b7f7bfc3f 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild @@ -81,7 +81,7 @@ src_compile() { src_install() { into /usr doman ${PN}.conf.5 ${PN}.8 - dosbin ${PN} || die "disbin failed" + dosbin ${PN} dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ README README.security REWARD SIZE \ @@ -89,10 +89,10 @@ src_install() { newdoc ${PN}.conf ${PN}.conf.example docinto security - dodoc SECURITY/* || die "dodoc failed" + dodoc SECURITY/* insinto "/usr/share/doc/${PF}/examples" - doins -r EXAMPLE/* || die "doins faileD" + doins -r EXAMPLE/* insinto /etc/${PN} newins ${PN}.conf{,.example} |