[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     51c366676fb2b2292a85accce933f228f3a9b5c0
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 11:57:53 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:04:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c36667

cmake-utils.eclass: add missing '|| die' on pushd/popd

 eclass/cmake-utils.eclass | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index dd6045a..c92759d 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -398,7 +398,7 @@ _modify-cmakelists() {
 enable_cmake-utils_src_prepare() {
        debug-print-function ${FUNCNAME} "$@"
 
-       pushd "${S}" > /dev/null
+       pushd "${S}" > /dev/null || die
 
        debug-print "$FUNCNAME: PATCHES=$PATCHES"
        [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
@@ -406,7 +406,7 @@ enable_cmake-utils_src_prepare() {
        debug-print "$FUNCNAME: applying user patches"
        epatch_user
 
-       popd > /dev/null
+       popd > /dev/null || die
 }
 
 # @VARIABLE: mycmakeargs
@@ -579,11 +579,11 @@ enable_cmake-utils_src_configure() {
                cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
        fi
 
-       pushd "${BUILD_DIR}" > /dev/null
+       pushd "${BUILD_DIR}" > /dev/null || die
        debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is 
${mycmakeargs_local[*]}"
        echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
        "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake 
failed"
-       popd > /dev/null
+       popd > /dev/null || die
 }
 
 enable_cmake-utils_src_compile() {
@@ -660,25 +660,25 @@ cmake-utils_src_make() {
        debug-print-function ${FUNCNAME} "$@"
 
        _check_build_dir
-       pushd "${BUILD_DIR}" > /dev/null
+       pushd "${BUILD_DIR}" > /dev/null || die
 
        ${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
 
-       popd > /dev/null
+       popd > /dev/null || die
 }
 
 enable_cmake-utils_src_test() {
        debug-print-function ${FUNCNAME} "$@"
 
        _check_build_dir
-       pushd "${BUILD_DIR}" > /dev/null
+       pushd "${BUILD_DIR}" > /dev/null || die
        [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; 
return 0 ; }
 
        [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose 
--output-on-failure )
 
        if ctest "${myctestargs[@]}" "$@" ; then
                einfo "Tests succeeded."
-               popd > /dev/null
+               popd > /dev/null || die
                return 0
        else
                if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
@@ -693,7 +693,7 @@ enable_cmake-utils_src_test() {
                fi
 
                # die might not die due to nonfatal
-               popd > /dev/null
+               popd > /dev/null || die
                return 1
        fi
 }
@@ -702,13 +702,13 @@ enable_cmake-utils_src_install() {
        debug-print-function ${FUNCNAME} "$@"
 
        _check_build_dir
-       pushd "${BUILD_DIR}" > /dev/null
+       pushd "${BUILD_DIR}" > /dev/null || die
        DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died 
running ${CMAKE_MAKEFILE_GENERATOR} install"
-       popd > /dev/null
+       popd > /dev/null || die
 
-       pushd "${S}" > /dev/null
+       pushd "${S}" > /dev/null || die
        einstalldocs
-       popd > /dev/null
+       popd > /dev/null || die
 }
 
 # @FUNCTION: cmake-utils_src_prepare