1 |
commit: f74b640f960526996b400da5157cc7f70bfe8172 |
2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 24 11:58:52 2015 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 24 21:56:24 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f74b640f |
7 |
|
8 |
gnome2-utils.eclass: add missing '|| die' on pushd/popd |
9 |
|
10 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
11 |
|
12 |
eclass/gnome2-utils.eclass | 20 ++++++++++---------- |
13 |
1 file changed, 10 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass |
16 |
index 7b7ffc6..835cb45 100644 |
17 |
--- a/eclass/gnome2-utils.eclass |
18 |
+++ b/eclass/gnome2-utils.eclass |
19 |
@@ -106,9 +106,9 @@ gnome2_environment_reset() { |
20 |
# This function should be called from pkg_preinst. |
21 |
gnome2_gconf_savelist() { |
22 |
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
23 |
- pushd "${ED}" &> /dev/null |
24 |
+ pushd "${ED}" &> /dev/null || die |
25 |
export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null) |
26 |
- popd &> /dev/null |
27 |
+ popd &> /dev/null || die |
28 |
} |
29 |
|
30 |
# @FUNCTION: gnome2_gconf_install |
31 |
@@ -200,9 +200,9 @@ gnome2_gconf_uninstall() { |
32 |
# This function should be called from pkg_preinst. |
33 |
gnome2_icon_savelist() { |
34 |
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
35 |
- pushd "${ED}" &> /dev/null |
36 |
+ pushd "${ED}" &> /dev/null || die |
37 |
export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) |
38 |
- popd &> /dev/null |
39 |
+ popd &> /dev/null || die |
40 |
} |
41 |
|
42 |
# @FUNCTION: gnome2_icon_cache_update |
43 |
@@ -321,9 +321,9 @@ gnome2_omf_fix() { |
44 |
# This function should be called from pkg_preinst. |
45 |
gnome2_scrollkeeper_savelist() { |
46 |
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
47 |
- pushd "${ED}" &> /dev/null |
48 |
+ pushd "${ED}" &> /dev/null || die |
49 |
export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null) |
50 |
- popd &> /dev/null |
51 |
+ popd &> /dev/null || die |
52 |
} |
53 |
|
54 |
# @FUNCTION: gnome2_scrollkeeper_update |
55 |
@@ -356,9 +356,9 @@ gnome2_scrollkeeper_update() { |
56 |
# This function should be called from pkg_preinst. |
57 |
gnome2_schemas_savelist() { |
58 |
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
59 |
- pushd "${ED}" &>/dev/null |
60 |
+ pushd "${ED}" &>/dev/null || die |
61 |
export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null) |
62 |
- popd &>/dev/null |
63 |
+ popd &>/dev/null || die |
64 |
} |
65 |
|
66 |
# @FUNCTION: gnome2_schemas_update |
67 |
@@ -392,9 +392,9 @@ gnome2_schemas_update() { |
68 |
# This function should be called from pkg_preinst. |
69 |
gnome2_gdk_pixbuf_savelist() { |
70 |
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
71 |
- pushd "${ED}" 1>/dev/null |
72 |
+ pushd "${ED}" 1>/dev/null || die |
73 |
export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null) |
74 |
- popd 1>/dev/null |
75 |
+ popd 1>/dev/null || die |
76 |
} |
77 |
|
78 |
# @FUNCTION: gnome2_gdk_pixbuf_update |