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

[Julian Ospald]

commit:     a413cb15f841e85c2800cb68321d1d0c7d791039
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 19:21:26 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 19:22:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a413cb15

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

Reviewed-By: James Le Cuirot <chewi <AT> gentoo.org>
Reviewed-By: Patrice Clement <monsieurp <AT> gentoo.org>

 eclass/java-utils-2.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index deab51d..f7a6a86 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -720,7 +720,7 @@ java-pkg_dosrc() {
                if [[ ${result} != 12 && ${result} != 0 ]]; then
                        die "failed to zip ${dir_name}"
                fi
-               popd >/dev/null
+               popd >/dev/null || die
        done
 
        # Install the zip
@@ -1033,11 +1033,11 @@ java-pkg_jar-from() {
                                        java-pkg_record-jar_ --build-only 
"${target_pkg}" "${jar}"
                                fi
                        fi
-                       popd > /dev/null
+                       popd > /dev/null || die
                        return 0
                fi
        done
-       popd > /dev/null
+       popd > /dev/null || die
        # if no target was specified, we're ok
        if [[ -z "${target_jar}" ]] ; then
                return 0
@@ -2487,9 +2487,9 @@ java-pkg_append_() {
 # @CODE
 # @RETURN: path to $1's parent directory
 java-pkg_expand_dir_() {
-       pushd "$(dirname "${1}")" >/dev/null 2>&1
+       pushd "$(dirname "${1}")" >/dev/null 2>&1 || die
        pwd
-       popd >/dev/null 2>&1
+       popd >/dev/null 2>&1 || die
 }
 
 # @FUNCTION: java-pkg_func-exists