From ae17d89347d2c9a604ccc984fb9f83c79e789162 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 7 Oct 2012 07:32:28 +0200 Subject: best_version() and has_version(): Improve die() messages. - Print different die() message for invalid atoms. - Mention ebuild-ipc instead of portageq in other die() messages when ebuild-ipc is actually used. --- bin/phase-helpers.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'bin/phase-helpers.sh') diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index dc70de658..55fe9f0f6 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -671,8 +671,15 @@ has_version() { 0|1) return ${retval} ;; + 2) + die "${FUNCNAME[0]}: invalid atom: ${atom}" + ;; *) - die "unexpected portageq exit code: ${retval}" + if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then + die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}" + else + die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}" + fi ;; esac } @@ -717,8 +724,15 @@ best_version() { 0|1) return ${retval} ;; + 2) + die "${FUNCNAME[0]}: invalid atom: ${atom}" + ;; *) - die "unexpected portageq exit code: ${retval}" + if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then + die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}" + else + die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}" + fi ;; esac } -- cgit v1.2.3-1-g7c22