aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2016-01-27 22:05:51 +0100
committerBrian Dolbec <dolsen@gentoo.org>2016-01-29 15:03:17 -0800
commit34dd17d154a4769c30a278f6bc407e8cb27706e9 (patch)
tree6379a4037769a0a8515317194e306e318b8e0cf1
parentClarify no binary packages error (bug 573070) (diff)
downloadportage-34dd17d154a4769c30a278f6bc407e8cb27706e9.tar.gz
portage-34dd17d154a4769c30a278f6bc407e8cb27706e9.tar.bz2
portage-34dd17d154a4769c30a278f6bc407e8cb27706e9.zip
isolated-functions.sh: Output error message for nofatal die.
X-Gentoo-Bug: 573056 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573056 Signed-off-by: Alexander Berntsen <bernalex@gentoo.org> Acked-by: Alexander Berntsen <bernalex@gentoo.org> Acked-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--bin/isolated-functions.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 57669218d..e320f7132 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}/eapi.sh" || exit 1
@@ -124,10 +124,11 @@ die() {
set +x # tracing only produces useless noise here
local IFS=$' \t\n'
- if ___eapi_die_can_respect_nonfatal; then
- if [[ ${1} == -n ]]; then
- [[ ${PORTAGE_NONFATAL} == 1 ]] && return 1
- shift
+ if ___eapi_die_can_respect_nonfatal && [[ $1 == -n ]]; then
+ shift
+ if [[ ${PORTAGE_NONFATAL} == 1 ]]; then
+ [[ $# -gt 0 ]] && eerror "$*"
+ return 1
fi
fi