| 1 |
commit: a413cb15f841e85c2800cb68321d1d0c7d791039 |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 25 19:21:26 2015 +0000 |
| 4 |
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 25 19:22:06 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a413cb15 |
| 7 |
|
| 8 |
java-utils-2.eclass: add missing '|| die' on pushd/popd |
| 9 |
|
| 10 |
Reviewed-By: James Le Cuirot <chewi <AT> gentoo.org> |
| 11 |
Reviewed-By: Patrice Clement <monsieurp <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/java-utils-2.eclass | 10 +++++----- |
| 14 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 17 |
index deab51d..f7a6a86 100644 |
| 18 |
--- a/eclass/java-utils-2.eclass |
| 19 |
+++ b/eclass/java-utils-2.eclass |
| 20 |
@@ -720,7 +720,7 @@ java-pkg_dosrc() { |
| 21 |
if [[ ${result} != 12 && ${result} != 0 ]]; then |
| 22 |
die "failed to zip ${dir_name}" |
| 23 |
fi |
| 24 |
- popd >/dev/null |
| 25 |
+ popd >/dev/null || die |
| 26 |
done |
| 27 |
|
| 28 |
# Install the zip |
| 29 |
@@ -1033,11 +1033,11 @@ java-pkg_jar-from() { |
| 30 |
java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}" |
| 31 |
fi |
| 32 |
fi |
| 33 |
- popd > /dev/null |
| 34 |
+ popd > /dev/null || die |
| 35 |
return 0 |
| 36 |
fi |
| 37 |
done |
| 38 |
- popd > /dev/null |
| 39 |
+ popd > /dev/null || die |
| 40 |
# if no target was specified, we're ok |
| 41 |
if [[ -z "${target_jar}" ]] ; then |
| 42 |
return 0 |
| 43 |
@@ -2487,9 +2487,9 @@ java-pkg_append_() { |
| 44 |
# @CODE |
| 45 |
# @RETURN: path to $1's parent directory |
| 46 |
java-pkg_expand_dir_() { |
| 47 |
- pushd "$(dirname "${1}")" >/dev/null 2>&1 |
| 48 |
+ pushd "$(dirname "${1}")" >/dev/null 2>&1 || die |
| 49 |
pwd |
| 50 |
- popd >/dev/null 2>&1 |
| 51 |
+ popd >/dev/null 2>&1 || die |
| 52 |
} |
| 53 |
|
| 54 |
# @FUNCTION: java-pkg_func-exists |
Archives