diff options
| author | Julian Ospald <hasufell@gentoo.org> | 2015-10-24 13:57:53 +0200 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-10-27 04:00:31 +1100 |
| commit | c3d374ca264adac473d63ecd10b67a2486027c39 (patch) | |
| tree | ac567a89ccc427a321a6af5cda26a898234bb422 | |
| parent | 078f73877ff091bfb87844300b0e7cfa5ba2087e (diff) | |
| download | kde-c3d374ca264adac473d63ecd10b67a2486027c39.tar.gz kde-c3d374ca264adac473d63ecd10b67a2486027c39.tar.bz2 kde-c3d374ca264adac473d63ecd10b67a2486027c39.zip | |
cmake-utils.eclass: add missing '|| die' on pushd/popd
| -rw-r--r-- | eclass/cmake-utils.eclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 9d4e03b6e98..65950e79f40 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -393,7 +393,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[@]}" @@ -401,7 +401,7 @@ enable_cmake-utils_src_prepare() { debug-print "$FUNCNAME: applying user patches" epatch_user - popd > /dev/null + popd > /dev/null || die } # @VARIABLE: mycmakeargs @@ -574,11 +574,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() { @@ -655,25 +655,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 @@ -688,7 +688,7 @@ enable_cmake-utils_src_test() { fi # die might not die due to nonfatal - popd > /dev/null + popd > /dev/null || die return 1 fi } @@ -697,13 +697,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 |