From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 11 Dec 2019 13:32:00 +0100 Subject: */*: [QA] Remove redundant `|| die` guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Reviewed-by: Michał Górny Reviewed-by: Andreas K. Hüttel Signed-off-by: David Seifert --- x11-wm/awesome/awesome-3.5.9-r2.ebuild | 6 +++--- x11-wm/fvwm/fvwm-2.6.5-r3.ebuild | 2 +- x11-wm/fvwm/fvwm-2.6.8-r2.ebuild | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild index 099659de11bc..619a51c6f336 100644 --- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild +++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild @@ -86,7 +86,7 @@ src_install() { ( cd "${CMAKE_BUILD_DIR}"/doc mv html doxygen - dohtml -r doxygen || die + dohtml -r doxygen ) fi rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed" @@ -98,12 +98,12 @@ src_install() { if use gnome ; then # GNOME session insinto /usr/share/gnome-session/sessions - newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die + newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" # Application launcher domenu "${FILESDIR}/${PN}-gnome.desktop" || die # X Session insinto /usr/share/xsessions/ - doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die + doins "${FILESDIR}/${PN}-gnome-xsession.desktop" fi } diff --git a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild index 2dc00c44059a..62f0374f99b3 100644 --- a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild +++ b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild @@ -153,7 +153,7 @@ src_install() { dodir /etc/X11/Sessions echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die - fperms a+x /etc/X11/Sessions/${PN} || die + fperms a+x /etc/X11/Sessions/${PN} dodoc AUTHORS ChangeLog NEWS README \ docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \ diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild index eb52e364b68c..b5e6d5907947 100644 --- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild +++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild @@ -144,7 +144,7 @@ src_install() { dodir /etc/X11/Sessions echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die - fperms a+x /etc/X11/Sessions/${PN} || die + fperms a+x /etc/X11/Sessions/${PN} dodoc docs/{COMMANDS,DEVELOPERS.md} -- cgit v1.2.3-65-gdbad