1 |
commit: f0ce7366b137119f087974d52ae807940e74ed56 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 27 21:05:51 2016 +0000 |
4 |
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 28 12:08:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0ce7366 |
7 |
|
8 |
isolated-functions.sh: Output error message for nofatal die. |
9 |
|
10 |
X-Gentoo-Bug: 573056 |
11 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573056 |
12 |
|
13 |
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org> |
14 |
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org> |
15 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
16 |
|
17 |
bin/isolated-functions.sh | 11 ++++++----- |
18 |
1 file changed, 6 insertions(+), 5 deletions(-) |
19 |
|
20 |
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh |
21 |
index 5766921..e320f71 100644 |
22 |
--- a/bin/isolated-functions.sh |
23 |
+++ b/bin/isolated-functions.sh |
24 |
@@ -1,5 +1,5 @@ |
25 |
#!/bin/bash |
26 |
-# Copyright 1999-2014 Gentoo Foundation |
27 |
+# Copyright 1999-2016 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
source "${PORTAGE_BIN_PATH}/eapi.sh" || exit 1 |
31 |
@@ -124,10 +124,11 @@ die() { |
32 |
set +x # tracing only produces useless noise here |
33 |
local IFS=$' \t\n' |
34 |
|
35 |
- if ___eapi_die_can_respect_nonfatal; then |
36 |
- if [[ ${1} == -n ]]; then |
37 |
- [[ ${PORTAGE_NONFATAL} == 1 ]] && return 1 |
38 |
- shift |
39 |
+ if ___eapi_die_can_respect_nonfatal && [[ $1 == -n ]]; then |
40 |
+ shift |
41 |
+ if [[ ${PORTAGE_NONFATAL} == 1 ]]; then |
42 |
+ [[ $# -gt 0 ]] && eerror "$*" |
43 |
+ return 1 |
44 |
fi |
45 |
fi |