diff options
| author | Julian Ospald <hasufell@gentoo.org> | 2015-10-25 20:21:26 +0100 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2015-10-25 20:22:06 +0100 |
| commit | a413cb15f841e85c2800cb68321d1d0c7d791039 (patch) | |
| tree | 232b105e84c69da9be513affeb72a4b1ca404f1a | |
| parent | 67a6620144235b427852f93ca030b38651a43024 (diff) | |
| download | gentoo-a413cb15f841e85c2800cb68321d1d0c7d791039.tar.gz gentoo-a413cb15f841e85c2800cb68321d1d0c7d791039.tar.xz | |
java-utils-2.eclass: add missing '|| die' on pushd/popd
Reviewed-By: James Le Cuirot <chewi@gentoo.org>
Reviewed-By: Patrice Clement <monsieurp@gentoo.org>
| -rw-r--r-- | eclass/java-utils-2.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index deab51da4a8..f7a6a86a752 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 |