[gentoo-commits] proj/lisp:master commit in: eclass/

[José María Alonso]

commit:     3c6610a924d9e67f04bb373b9bbef475a13e1546
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 21:37:08 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:37:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=3c6610a9

bash-completion-r1.eclass: Syncs with ebuild repository

 eclass/bash-completion-r1.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index 25519736..eb2dfce4 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # @ECLASS: bash-completion-r1.eclass
 # @MAINTAINER:
@@ -26,7 +25,7 @@
 inherit toolchain-funcs
 
 case ${EAPI:-0} in
-       0|1|2|3|4|5) ;;
+       0|1|2|3|4|5|6) ;;
        *) die "EAPI ${EAPI} unsupported (yet)."
 esac
 
@@ -41,12 +40,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
 }
 
@@ -129,6 +129,7 @@ bashcomp_alias() {
        shift
 
        for f; do
-               dosym "${base}" "$(_bash-completion-r1_get_bashcompdir)/${f}"
+               dosym "${base}" "$(_bash-completion-r1_get_bashcompdir)/${f}" \
+                       || return
        done
 }