Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 29 Nov 2015 10:07:35
Message-Id: 1448791643.e2b497dbdb03528badeaa83e6d4ec4849de49172.mgorny@gentoo
1 commit: e2b497dbdb03528badeaa83e6d4ec4849de49172
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 27 13:49:42 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 10:07:23 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b497db
7
8 bash-completion-r1.eclass: Die on pkg-config getter failure
9
10 eclass/bash-completion-r1.eclass | 5 +++--
11 1 file changed, 3 insertions(+), 2 deletions(-)
12
13 diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
14 index 2551973..9877baa 100644
15 --- a/eclass/bash-completion-r1.eclass
16 +++ b/eclass/bash-completion-r1.eclass
17 @@ -41,12 +41,13 @@ _bash-completion-r1_get_bashdir() {
18 debug-print-function ${FUNCNAME} "${@}"
19
20 if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then
21 - local path="$($(tc-getPKG_CONFIG) --variable=$1 bash-completion)"
22 + local path
23 + path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die
24 # we need to return unprefixed, so strip from what pkg-config returns
25 # to us, bug #477692
26 echo "${path#${EPREFIX}}"
27 else
28 - echo $2
29 + echo "${2}"
30 fi
31 }