Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 1/3] bash-completion-r1.eclass: Die on pkg-config getter failure
Date: Fri, 27 Nov 2015 13:54:42
Message-Id: 1448632419-11782-2-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCHES] bash-completion-r1.eclass: Error handling cleanup + EAPI 6 by "Michał Górny"
1 ---
2 eclass/bash-completion-r1.eclass | 5 +++--
3 1 file changed, 3 insertions(+), 2 deletions(-)
4
5 diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
6 index 2551973..9877baa 100644
7 --- a/eclass/bash-completion-r1.eclass
8 +++ b/eclass/bash-completion-r1.eclass
9 @@ -41,12 +41,13 @@ _bash-completion-r1_get_bashdir() {
10 debug-print-function ${FUNCNAME} "${@}"
11
12 if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then
13 - local path="$($(tc-getPKG_CONFIG) --variable=$1 bash-completion)"
14 + local path
15 + path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die
16 # we need to return unprefixed, so strip from what pkg-config returns
17 # to us, bug #477692
18 echo "${path#${EPREFIX}}"
19 else
20 - echo $2
21 + echo "${2}"
22 fi
23 }
24
25 --
26 2.6.3