From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 27 Nov 2015 13:49:42 +0000 (+0100)
Subject: bash-completion-r1.eclass: Die on pkg-config getter failure
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e2b497dbdb03528badeaa83e6d4ec4849de49172;p=gentoo.git

bash-completion-r1.eclass: Die on pkg-config getter failure
---

diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index 255197361229..9877baa3fd7e 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -41,12 +41,13 @@ _bash-completion-r1_get_bashdir() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then
-		local path="$($(tc-getPKG_CONFIG) --variable=$1 bash-completion)"
+		local path
+		path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die
 		# we need to return unprefixed, so strip from what pkg-config returns
 		# to us, bug #477692
 		echo "${path#${EPREFIX}}"
 	else
-		echo $2
+		echo "${2}"
 	fi
 }