From 45dd7b77d48f80c2f778b8d9b2b448d3776d3cf8 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 24 Oct 2015 13:59:00 +0200 Subject: [PATCH] haskell-cabal.eclass: add missing '|| die' on pushd/popd Signed-off-by: Sergei Trofimovich --- eclass/haskell-cabal.eclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 132c3a1073b8a..334b243c447d5 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -523,13 +523,13 @@ haskell-cabal_pkg_setup() { haskell-cabal_src_configure() { cabal-is-dummy-lib && return - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die cabal-bootstrap cabal-configure "$@" - popd > /dev/null + popd > /dev/null || die } # exported function: nice alias @@ -592,15 +592,15 @@ cabal_src_compile() { } haskell-cabal_src_compile() { - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die cabal_src_compile "$@" - popd > /dev/null + popd > /dev/null || die } haskell-cabal_src_test() { - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die if cabal-is-dummy-lib; then einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}" @@ -611,7 +611,7 @@ haskell-cabal_src_test() { ./setup "$@" || die "cabal test failed" fi - popd > /dev/null + popd > /dev/null || die } # exported function: cabal-style copy and register @@ -635,11 +635,11 @@ cabal_src_install() { } haskell-cabal_src_install() { - pushd "${S}" > /dev/null + pushd "${S}" > /dev/null || die cabal_src_install - popd > /dev/null + popd > /dev/null || die } haskell-cabal_pkg_postinst() {