| 1 |
commit: 6fb9fa1eccb810caa338259a690c5f43ca052590 |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 26 17:10:13 2015 +0000 |
| 4 |
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 26 17:10:13 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb9fa1e |
| 7 |
|
| 8 |
ruby-ng.eclass: add missing '|| die' on pushd/popd |
| 9 |
|
| 10 |
Reviewed-By: Hans de Graaff <graaff <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/ruby-ng.eclass | 16 ++++++++-------- |
| 13 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass |
| 16 |
index d560ba8..ad25456 100644 |
| 17 |
--- a/eclass/ruby-ng.eclass |
| 18 |
+++ b/eclass/ruby-ng.eclass |
| 19 |
@@ -324,9 +324,9 @@ _ruby_invoke_environment() { |
| 20 |
eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead." |
| 21 |
;; |
| 22 |
esac |
| 23 |
- pushd "${WORKDIR}"/all &>/dev/null |
| 24 |
+ pushd "${WORKDIR}"/all &>/dev/null || die |
| 25 |
sub_S=$(eval ls -d "${sub_S}" 2>/dev/null) |
| 26 |
- popd &>/dev/null |
| 27 |
+ popd &>/dev/null || die |
| 28 |
fi |
| 29 |
|
| 30 |
environment=$1; shift |
| 31 |
@@ -335,16 +335,16 @@ _ruby_invoke_environment() { |
| 32 |
S="${my_WORKDIR}"/"${sub_S}" |
| 33 |
|
| 34 |
if [[ -d "${S}" ]]; then |
| 35 |
- pushd "$S" &>/dev/null |
| 36 |
+ pushd "$S" &>/dev/null || die |
| 37 |
elif [[ -d "${my_WORKDIR}" ]]; then |
| 38 |
- pushd "${my_WORKDIR}" &>/dev/null |
| 39 |
+ pushd "${my_WORKDIR}" &>/dev/null || die |
| 40 |
else |
| 41 |
- pushd "${WORKDIR}" &>/dev/null |
| 42 |
+ pushd "${WORKDIR}" &>/dev/null || die |
| 43 |
fi |
| 44 |
|
| 45 |
ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment" |
| 46 |
"$@" |
| 47 |
- popd &>/dev/null |
| 48 |
+ popd &>/dev/null || die |
| 49 |
|
| 50 |
S=${old_S} |
| 51 |
} |
| 52 |
@@ -392,7 +392,7 @@ ruby-ng_pkg_setup() { |
| 53 |
# Unpack the source archive. |
| 54 |
ruby-ng_src_unpack() { |
| 55 |
mkdir "${WORKDIR}"/all |
| 56 |
- pushd "${WORKDIR}"/all &>/dev/null |
| 57 |
+ pushd "${WORKDIR}"/all &>/dev/null || die |
| 58 |
|
| 59 |
# We don't support an each-unpack, it's either all or nothing! |
| 60 |
if type all_ruby_unpack &>/dev/null; then |
| 61 |
@@ -401,7 +401,7 @@ ruby-ng_src_unpack() { |
| 62 |
[[ -n ${A} ]] && unpack ${A} |
| 63 |
fi |
| 64 |
|
| 65 |
- popd &>/dev/null |
| 66 |
+ popd &>/dev/null || die |
| 67 |
} |
| 68 |
|
| 69 |
_ruby_apply_patches() { |
Archives