commit: dacc65a567e8d2fe9fd553e69160131054e41717 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 21 06:33:07 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 21 07:04:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dacc65a5
eapi7-ver.eclass: Special-case -r0 eclass/eapi7-ver.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/eapi7-ver.eclass b/eclass/eapi7-ver.eclass index aeb9dedd78b..e833835a56e 100644 --- a/eclass/eapi7-ver.eclass +++ b/eclass/eapi7-ver.eclass @@ -207,6 +207,10 @@ ver_test() { *) die "${FUNCNAME}: invalid operator: ${op}" ;; esac + # explicitly strip -r0[00000...] to avoid overcomplexifying the algo + [[ ${va} == *-r0* && 10#${va#*-r} -eq 0 ]] && va=${va%-r*} + [[ ${vb} == *-r0* && 10#${vb#*-r} -eq 0 ]] && vb=${vb%-r*} + local comp compb _ver_split "${vb}" compb=( "${comp[@]}" )