summaryrefslogtreecommitdiff
path: root/net-fs
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-fs
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-fs')
-rw-r--r--net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild4
-rw-r--r--net-fs/samba/samba-4.10.10.ebuild2
-rw-r--r--net-fs/samba/samba-4.10.2.ebuild2
-rw-r--r--net-fs/samba/samba-4.10.8.ebuild2
-rw-r--r--net-fs/samba/samba-4.11.1.ebuild2
-rw-r--r--net-fs/samba/samba-4.11.2.ebuild2
-rw-r--r--net-fs/samba/samba-4.8.12.ebuild2
-rw-r--r--net-fs/samba/samba-4.8.6-r3.ebuild2
-rw-r--r--net-fs/samba/samba-4.9.13.ebuild2
-rw-r--r--net-fs/samba/samba-4.9.15.ebuild2
-rw-r--r--net-fs/samba/samba-4.9.16.ebuild2
11 files changed, 12 insertions, 12 deletions
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
index aeda73ee956a..3cababd6aa33 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
@@ -77,8 +77,8 @@ src_install() {
#ln -s "${D}"/usr/lib64/libncp.so.2.3 "${D}"/libncp.so.2.3.0
# Install the main programs, then the headers.
- emake DESTDIR="${D}" install || die
- emake DESTDIR="${D}" install-dev || die
+ emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install-dev
# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
newconfd "${FILESDIR}"/ipx.confd ipx
diff --git a/net-fs/samba/samba-4.10.10.ebuild b/net-fs/samba/samba-4.10.10.ebuild
index d24131ca91cb..1f0de6ef9a86 100644
--- a/net-fs/samba/samba-4.10.10.ebuild
+++ b/net-fs/samba/samba-4.10.10.ebuild
@@ -280,7 +280,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild
index a1e8acf7aed2..7517cb4afc56 100644
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.10.8.ebuild b/net-fs/samba/samba-4.10.8.ebuild
index 66119026d236..b675f8c85a89 100644
--- a/net-fs/samba/samba-4.10.8.ebuild
+++ b/net-fs/samba/samba-4.10.8.ebuild
@@ -280,7 +280,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.11.1.ebuild b/net-fs/samba/samba-4.11.1.ebuild
index e971356a350a..8a88f65a21d8 100644
--- a/net-fs/samba/samba-4.11.1.ebuild
+++ b/net-fs/samba/samba-4.11.1.ebuild
@@ -276,7 +276,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.11.2.ebuild b/net-fs/samba/samba-4.11.2.ebuild
index e971356a350a..8a88f65a21d8 100644
--- a/net-fs/samba/samba-4.11.2.ebuild
+++ b/net-fs/samba/samba-4.11.2.ebuild
@@ -276,7 +276,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
index a16b7a81e761..ad3cf03c2386 100644
--- a/net-fs/samba/samba-4.8.12.ebuild
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -275,7 +275,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild
index 6be58e9b9728..9d93bd81c79e 100644
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ b/net-fs/samba/samba-4.8.6-r3.ebuild
@@ -273,7 +273,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.9.13.ebuild b/net-fs/samba/samba-4.9.13.ebuild
index d2b15f5811ff..b65c53c68ed6 100644
--- a/net-fs/samba/samba-4.9.13.ebuild
+++ b/net-fs/samba/samba-4.9.13.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.9.15.ebuild b/net-fs/samba/samba-4.9.15.ebuild
index 0253eb32433a..3ad0587ccb32 100644
--- a/net-fs/samba/samba-4.9.15.ebuild
+++ b/net-fs/samba/samba-4.9.15.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.9.16.ebuild b/net-fs/samba/samba-4.9.16.ebuild
index 0253eb32433a..3ad0587ccb32 100644
--- a/net-fs/samba/samba-4.9.16.ebuild
+++ b/net-fs/samba/samba-4.9.16.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
# bugs #376853 and #590374
insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf || die
+ doins examples/pam_winbind/pam_winbind.conf
fi
keepdir /var/cache/samba