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 /dev-python | |
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 'dev-python')
22 files changed, 34 insertions, 31 deletions
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild index 9f5b59fc1fce..64f187924daf 100644 --- a/dev-python/deform/deform-0.9.9.ebuild +++ b/dev-python/deform/deform-0.9.9.ebuild @@ -36,5 +36,5 @@ src_install() { # the docs would not actually work offline). Install the # source, which is somewhat readable. docinto docs - dodoc docs/*.rst || die + dodoc docs/*.rst } diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild index 4e3c6cc80948..45f254647785 100644 --- a/dev-python/demjson/demjson-2.2.4.ebuild +++ b/dev-python/demjson/demjson-2.2.4.ebuild @@ -30,6 +30,6 @@ python_install_all() { distutils-r1_python_install_all # Docs are .txt files if use doc; then - dodoc docs/*.txt || die "Installation of documentation failed" + dodoc docs/*.txt fi } diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild index 569085071b25..e3f7b6251a8d 100644 --- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild +++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild @@ -40,18 +40,18 @@ src_compile() { # Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a # separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory. compile_gst() { - emake -C common || die "emake common failed" - emake -C gi || die "emake gi failed" - emake -C testsuite || die "emake testsuite failed" + emake -C common + emake -C gi + emake -C testsuite } python_foreach_impl run_in_build_dir compile_gst } src_install() { install_gst() { - emake DESTDIR="${D}" install -C common || die "emake install common failed" - emake DESTDIR="${D}" install -C gi || die "emake install gi failed" - emake DESTDIR="${D}" install -C testsuite || die "emake install testsuite failed" + emake DESTDIR="${D}" install -C common + emake DESTDIR="${D}" install -C gi + emake DESTDIR="${D}" install -C testsuite } python_foreach_impl run_in_build_dir install_gst prune_libtool_files --modules @@ -60,7 +60,7 @@ src_install() { src_test() { test_gst() { - emake check -C testsuite || die "emake check failed" + emake check -C testsuite } python_foreach_impl run_in_build_dir default } diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild index fd89b019d00b..62ce4473535f 100644 --- a/dev-python/kombu/kombu-4.1.0-r1.ebuild +++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild @@ -61,7 +61,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild index 1825bba9b97c..9a01b53918ed 100644 --- a/dev-python/kombu/kombu-4.2.1.ebuild +++ b/dev-python/kombu/kombu-4.2.1.ebuild @@ -61,7 +61,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/kombu/kombu-4.4.0.ebuild b/dev-python/kombu/kombu-4.4.0.ebuild index 02ecc18e0153..150bcb6f11c2 100644 --- a/dev-python/kombu/kombu-4.4.0.ebuild +++ b/dev-python/kombu/kombu-4.4.0.ebuild @@ -60,7 +60,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild index 21fbbd1c8de1..76cd369ab368 100644 --- a/dev-python/kombu/kombu-4.6.3.ebuild +++ b/dev-python/kombu/kombu-4.6.3.ebuild @@ -60,7 +60,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild index e018c9015d74..917b45b73559 100644 --- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild +++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild @@ -34,7 +34,7 @@ python_prepare_all() { python_compile_all() { if use doc; then einfo "Generation of documentation" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild index 80b2f3f2d0aa..8da62ea3e277 100644 --- a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild +++ b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild @@ -21,7 +21,7 @@ RDEPEND="${DEPEND}" python_install_all() { insinto /usr/share/doc/${PF} - doins test.py || die "doins failed" + doins test.py distutils-r1_python_install_all } diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild index 50781aa5e809..b4ad8f55d1d4 100644 --- a/dev-python/plyr/plyr-1.0.6.ebuild +++ b/dev-python/plyr/plyr-1.0.6.ebuild @@ -43,7 +43,7 @@ python_compile() { python_compile_all() { if use doc; then - emake -C docs html || die "Generating documentation failed" + emake -C docs html fi } diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild index 82f177d6e636..4f5d068ba0ea 100644 --- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild +++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild @@ -33,5 +33,5 @@ python_test() { python_install_all() { distutils-r1_python_install_all insinto /usr/share/doc/${PF}/tools - doins tools/* || die "doins failed" + doins tools/* } diff --git a/dev-python/pygobject/pygobject-3.28.3.ebuild b/dev-python/pygobject/pygobject-3.28.3.ebuild index 1c3a17815bd3..316b173782ab 100644 --- a/dev-python/pygobject/pygobject-3.28.3.ebuild +++ b/dev-python/pygobject/pygobject-3.28.3.ebuild @@ -88,7 +88,7 @@ src_test() { testing() { local -x XDG_CACHE_HOME="${T}/${EPYTHON}" - emake -C "${BUILD_DIR}" check || die "emake check failed" + emake -C "${BUILD_DIR}" check } virtx python_foreach_impl testing } diff --git a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild index 5b91f0546d16..51eafea936d2 100644 --- a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild +++ b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild @@ -22,11 +22,14 @@ IUSE="" S="${WORKDIR}"/${PN} src_configure() { - cd "${WORKDIR}"/Minuit-1_7_9 && econf --disable-static || die + cd "${WORKDIR}"/Minuit-1_7_9 || die + econf --disable-static } + src_compile() { - cd "${WORKDIR}"/Minuit-1_7_9 && emake - cd "${S}" + cd "${WORKDIR}"/Minuit-1_7_9 || die + emake + cd "${S}" || die distutils-r1_src_compile } diff --git a/dev-python/python-backoff/python-backoff-1.6.0.ebuild b/dev-python/python-backoff/python-backoff-1.6.0.ebuild index a79914430125..18ceb6574358 100644 --- a/dev-python/python-backoff/python-backoff-1.6.0.ebuild +++ b/dev-python/python-backoff/python-backoff-1.6.0.ebuild @@ -21,5 +21,5 @@ S=${WORKDIR}/${MY_P} DOCS=( README.rst ) python_test() { - emake test || die "tests failed under ${EPYTHON}" + emake test } diff --git a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild index 2018fe932467..6f3c061f3c0b 100644 --- a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild +++ b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild @@ -22,7 +22,7 @@ DEPEND="${RDEPEND} dev-lang/swig:0" src_prepare() { - emake swig || die + emake swig distutils-r1_src_prepare } diff --git a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild index 691c560be705..36d9ec81b2d2 100644 --- a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild +++ b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild @@ -21,7 +21,7 @@ RDEPEND="${DEPEND}" python_install_all() { if use doc; then - dodoc docs/*.txt || die "dodoc failed" + dodoc docs/*.txt fi distutils-r1_python_install_all } diff --git a/dev-python/soya/soya-0.15_rc1-r1.ebuild b/dev-python/soya/soya-0.15_rc1-r1.ebuild index 37ff57f4f1fa..b65bea0bde73 100644 --- a/dev-python/soya/soya-0.15_rc1-r1.ebuild +++ b/dev-python/soya/soya-0.15_rc1-r1.ebuild @@ -54,10 +54,10 @@ src_install() { insinto /usr/share/${PF} if use doc; then cd "${WORKDIR}/${TUT_P}/doc" - doins soya_guide.pdf pudding/pudding.pdf || die "doins failed" + doins soya_guide.pdf pudding/pudding.pdf fi if use examples; then cd "${WORKDIR}/${TUT_P}" - doins -r tutorial || die "doins failed" + doins -r tutorial fi } diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild index b10c9c978663..4687b6bc6238 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild @@ -33,7 +33,7 @@ python_compile_all() { if use doc; then einfo ""; einfo "The build seeks to import modules from an installed state of the package" einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo "" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild index 7ff3ee775474..496cd9854974 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild @@ -39,7 +39,7 @@ python_compile_all() { if use doc; then einfo ""; einfo "The build seeks to import modules from an installed state of the package" einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo "" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild index b45e9b97e52c..fc9c7059b29e 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild @@ -32,7 +32,7 @@ python_compile_all() { if use doc; then einfo ""; einfo "The build seeks to import modules from an installed state of the package" einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo "" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild index b4ca9f67d466..b6efee3fc7bc 100644 --- a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild +++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild @@ -39,5 +39,5 @@ python_test() { distutils_install_for_testing PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \ - emake check || die "Tests failed under ${EPYTHON}" + emake check } diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild index 591aa7b96271..53ca061c7f9f 100644 --- a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild +++ b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild @@ -55,7 +55,7 @@ python_install_all() { pushd docs/_build/html > /dev/null docinto html insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static || die "Installation of documentation failed" + doins -r [a-z]* _static popd > /dev/null fi distutils-r1_python_install_all |