Gentoo Archives: gentoo-commits

From: Julian Ospald <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 26 Oct 2015 17:11:39
Message-Id: 1445879385.a8eb4667f5dc47d62dbc23287c9b997e2f14d3c4.hasufell@gentoo
1 commit: a8eb4667f5dc47d62dbc23287c9b997e2f14d3c4
2 Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 17:09:45 2015 +0000
4 Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 17:09:45 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8eb4667
7
8 ruby-fakegem.eclass: add missing '|| die' on pushd/popd
9
10 Reviewed-By: Hans de Graaff <graaff <AT> gentoo.org>
11
12 eclass/ruby-fakegem.eclass | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15 diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
16 index ed392b5..7f2b075 100644
17 --- a/eclass/ruby-fakegem.eclass
18 +++ b/eclass/ruby-fakegem.eclass
19 @@ -406,13 +406,13 @@ all_ruby_unpack() {
20 eend $?
21
22 mkdir "${S}"
23 - pushd "${S}" &>/dev/null
24 + pushd "${S}" &>/dev/null || die
25
26 ebegin "Unpacking data.tar.gz"
27 tar -mxf "${my_WORKDIR}"/data.tar.gz || die
28 eend $?
29
30 - popd &>/dev/null
31 + popd &>/dev/null || die
32 ;;
33 *.patch.bz2)
34 # We apply the patches with RUBY_PATCHES directly from DISTDIR,
35 @@ -498,9 +498,9 @@ all_fakegem_install() {
36 for dir in ${RUBY_FAKEGEM_DOCDIR}; do
37 [[ -d ${dir} ]] || continue
38
39 - pushd ${dir} &>/dev/null
40 + pushd ${dir} &>/dev/null || die
41 dohtml -r * || die "failed to install documentation"
42 - popd &>/dev/null
43 + popd &>/dev/null || die
44 done
45 fi
46
47 @@ -514,12 +514,12 @@ all_fakegem_install() {
48 local bindir=$(find "${D}" -type d -path "*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin" -print -quit)
49
50 if [[ -d "${bindir}" ]]; then
51 - pushd "${bindir}" &>/dev/null
52 + pushd "${bindir}" &>/dev/null || die
53 local binaries=$(eval ls ${RUBY_FAKEGEM_BINWRAP})
54 for binary in $binaries; do
55 ruby_fakegem_binwrapper $binary
56 done
57 - popd &>/dev/null
58 + popd &>/dev/null || die
59 fi
60 fi
61 }