gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-07 18:07:08 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Reviewed-By: James Le Cuirot <chewi@gentoo.org>
Reviewed-By: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Julian Ospald
2015-10-25 20:22:06 +01:00
parent 67a6620144
commit a413cb15f8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eclass/java-utils-2.eclass
+5 -5
View File
@@ -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