Skip to content

Commit

Permalink
java-utils-2.eclass: add missing '|| die' on pushd/popd
Browse files Browse the repository at this point in the history
Reviewed-By: James Le Cuirot <[email protected]>
Reviewed-By: Patrice Clement <[email protected]>
  • Loading branch information
Julian Ospald committed Oct 25, 2015
1 parent 67a6620 commit a413cb1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions eclass/java-utils-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a413cb1

Please sign in to comment.