From: Julian Ospald <hasufell@gentoo.org>
Date: Mon, 26 Oct 2015 17:10:13 +0000 (+0100)
Subject: ruby-ng.eclass: add missing '|| die' on pushd/popd
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6fb9fa1eccb810caa338259a690c5f43ca052590;p=gentoo.git

ruby-ng.eclass: add missing '|| die' on pushd/popd

Reviewed-By: Hans de Graaff <graaff@gentoo.org>
---

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() {