Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Mon, 26 Oct 2015 17:25:02
Message-Id: 1445880287.0cbcc8a7a13fa35acb55253027e6f282d98c0168.kensington@gentoo
1 commit: 0cbcc8a7a13fa35acb55253027e6f282d98c0168
2 Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 24 11:59:41 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 17:24:47 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0cbcc8a7
7
8 kde4-meta.eclass: add missing '|| die' on pushd/popd
9
10 eclass/kde4-meta.eclass | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13 diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
14 index d3aae4e..2e243b0 100644
15 --- a/eclass/kde4-meta.eclass
16 +++ b/eclass/kde4-meta.eclass
17 @@ -209,7 +209,7 @@ kde4-meta_src_extract() {
18 done
19 extractlist+=" $(_list_needed_subdirectories)"
20
21 - pushd "${WORKDIR}" > /dev/null
22 + pushd "${WORKDIR}" > /dev/null || die
23
24 # @ECLASS-VARIABLE: KDE4_STRICTER
25 # @DESCRIPTION:
26 @@ -223,7 +223,7 @@ kde4-meta_src_extract() {
27 mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
28 fi
29
30 - popd > /dev/null
31 + popd > /dev/null || die
32
33 eend $?
34
35 @@ -398,7 +398,7 @@ _change_cmakelists_parent_dirs() {
36 kde4-meta_change_cmakelists() {
37 debug-print-function ${FUNCNAME} "$@"
38
39 - pushd "${S}" > /dev/null
40 + pushd "${S}" > /dev/null || die
41
42 comment_all_add_subdirectory ./
43
44 @@ -547,7 +547,7 @@ kde4-meta_change_cmakelists() {
45 ;;
46 esac
47
48 - popd > /dev/null
49 + popd > /dev/null || die
50 }
51
52 # @FUNCTION: kde4-meta_src_configure