diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2015-10-26 18:10:13 +0100 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2015-10-26 18:10:13 +0100 |
| commit | 6fb9fa1eccb810caa338259a690c5f43ca052590 (patch) | |
| tree | c2da99238740b1d96d85e409d97a42ae48f432c9 /eclass/ruby-ng.eclass | |
| parent | ruby-fakegem.eclass: add missing '|| die' on pushd/popd (diff) | |
| download | gentoo-6fb9fa1eccb810caa338259a690c5f43ca052590.tar.gz gentoo-6fb9fa1eccb810caa338259a690c5f43ca052590.tar.bz2 gentoo-6fb9fa1eccb810caa338259a690c5f43ca052590.zip | |
ruby-ng.eclass: add missing '|| die' on pushd/popd
Reviewed-By: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'eclass/ruby-ng.eclass')
| -rw-r--r-- | eclass/ruby-ng.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index d560ba8ed90f..ad25456cae50 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -324,9 +324,9 @@ _ruby_invoke_environment() { eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead." ;; esac - pushd "${WORKDIR}"/all &>/dev/null + pushd "${WORKDIR}"/all &>/dev/null || die sub_S=$(eval ls -d "${sub_S}" 2>/dev/null) - popd &>/dev/null + popd &>/dev/null || die fi environment=$1; shift @@ -335,16 +335,16 @@ _ruby_invoke_environment() { S="${my_WORKDIR}"/"${sub_S}" if [[ -d "${S}" ]]; then - pushd "$S" &>/dev/null + pushd "$S" &>/dev/null || die elif [[ -d "${my_WORKDIR}" ]]; then - pushd "${my_WORKDIR}" &>/dev/null + pushd "${my_WORKDIR}" &>/dev/null || die else - pushd "${WORKDIR}" &>/dev/null + pushd "${WORKDIR}" &>/dev/null || die fi ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment" "$@" - popd &>/dev/null + popd &>/dev/null || die S=${old_S} } @@ -392,7 +392,7 @@ ruby-ng_pkg_setup() { # Unpack the source archive. ruby-ng_src_unpack() { mkdir "${WORKDIR}"/all - pushd "${WORKDIR}"/all &>/dev/null + pushd "${WORKDIR}"/all &>/dev/null || die # We don't support an each-unpack, it's either all or nothing! if type all_ruby_unpack &>/dev/null; then @@ -401,7 +401,7 @@ ruby-ng_src_unpack() { [[ -n ${A} ]] && unpack ${A} fi - popd &>/dev/null + popd &>/dev/null || die } _ruby_apply_patches() { |