summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2018-05-08 21:08:48 +0200
committerUlrich Müller <ulm@gentoo.org>2018-05-14 00:39:26 +0200
commitdcb54ddb42a765ec46c05be53e89ea14adb8d0cc (patch)
tree5dcbaa537c79c196c0c72214c0da1aa33eda2817 /eclass/eapi7-ver.eclass
parentapp-emulation/free42: x86 stable (bug #655422) (diff)
downloadgentoo-dcb54ddb42a765ec46c05be53e89ea14adb8d0cc.tar.gz
gentoo-dcb54ddb42a765ec46c05be53e89ea14adb8d0cc.tar.bz2
gentoo-dcb54ddb42a765ec46c05be53e89ea14adb8d0cc.zip
eapi7-ver.eclass: Support EAPIs 0 to 6.
Diffstat (limited to 'eclass/eapi7-ver.eclass')
-rw-r--r--eclass/eapi7-ver.eclass16
1 files changed, 7 insertions, 9 deletions
diff --git a/eclass/eapi7-ver.eclass b/eclass/eapi7-ver.eclass
index 6117124a90a..ab512bd24e4 100644
--- a/eclass/eapi7-ver.eclass
+++ b/eclass/eapi7-ver.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: eapi7-ver.eclass
@@ -58,12 +58,9 @@
# the version string, it is truncated silently.
case ${EAPI:-0} in
- 0|1|2|3|4|5)
- die "${ECLASS}: EAPI=${EAPI:-0} not supported";;
- 6)
- ;;
- *)
- die "${ECLASS}: EAPI=${EAPI} includes all functions from this eclass";;
+ 0|1|2|3|4|5|6) ;;
+ 7) die "${ECLASS}: EAPI=${EAPI} includes all functions from this eclass" ;;
+ *) die "${ECLASS}: EAPI=${EAPI} unknown" ;;
esac
# @FUNCTION: _ver_parse_range
@@ -135,11 +132,12 @@ ver_cut() {
local max=$((${#comp[@]}/2))
_ver_parse_range "${range}" "${max}"
- local IFS=
if [[ ${start} -gt 0 ]]; then
start=$(( start*2 - 1 ))
fi
- echo "${comp[*]:start:end*2-start}"
+ # Work around a bug in bash-3.2, where "${comp[*]:start:end*2-start}"
+ # inserts stray 0x7f characters for empty array elements
+ printf "%s" "${comp[@]:start:end*2-start}" $'\n'
}
# @FUNCTION: ver_rs