Skip to content

Commit

Permalink
haskell-cabal.eclass: add missing '|| die' on pushd/popd
Browse files Browse the repository at this point in the history
Signed-off-by: Sergei Trofimovich <[email protected]>
  • Loading branch information
Julian Ospald authored and Sergei Trofimovich committed Oct 24, 2015
1 parent 6b70987 commit 45dd7b7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions eclass/haskell-cabal.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand All @@ -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
Expand All @@ -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() {
Expand Down

0 comments on commit 45dd7b7

Please sign in to comment.