diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2016-01-28 08:50:20 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2016-01-28 08:51:26 +0100 |
| commit | 56f8075e23d42eba53c4b3d2561eb8950f2a98ec (patch) | |
| tree | 76d3ef81be7391625397bb8741289226fae9c155 | |
| parent | cmake-utils.eclass: Fix inverted logic on EAPI check (diff) | |
| download | gentoo-56f8075e23d42eba53c4b3d2561eb8950f2a98ec.tar.gz gentoo-56f8075e23d42eba53c4b3d2561eb8950f2a98ec.tar.bz2 gentoo-56f8075e23d42eba53c4b3d2561eb8950f2a98ec.zip | |
cmake-utils.eclass: Merge consecutive [[ ]] into single [[ ]]
Signed-off-by: Justin Lecher <jlec@gentoo.org>
| -rw-r--r-- | eclass/cmake-utils.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 99c0f7649400..a5704c12f55a 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -185,7 +185,7 @@ _cmake_use_me_now_inverted() { local arg=$2 [[ ! -z $3 ]] && arg=$3 - if [[ ${EAPI} != [2345] ]] && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then + if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss" fi @@ -314,7 +314,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; } # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled. # This can be used to make find_package optional. cmake-utils_use_find_package() { - if [[ ${EAPI} != [2345] ]] && [[ "$#" != 2 ]] ; then + if [[ ${EAPI} != [2345] && "$#" != 2 ]] ; then die "Usage: cmake-utils_use_find_package <USE flag> <package name>" fi |