From af9620f533d988afa6fd7f0759390aca571bceef Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 29 Dec 2017 21:43:55 +0000 Subject: [PATCH] java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes --- eclass/java-utils-2.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index a09a8c951e8e0..25e35c33dd214 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2907,7 +2907,7 @@ java-pkg_gen-cp() { local atom for atom in ${CP_DEPEND}; do - if [[ ${atom} =~ /(([[:alnum:]+_-]+)-[0-9]+(\.[0-9]+)*[a-z]?(_[[:alnum:]]+)?(-r[0-9]*)?|[[:alnum:]+_-]+):([[:alnum:]+_.-]+) ]]; then + if [[ ${atom} =~ /(([[:alnum:]+_-]+)-[0-9]+(\.[0-9]+)*[a-z]?(_[[:alnum:]]+)*(-r[0-9]*)?|[[:alnum:]+_-]+):([[:alnum:]+_.-]+) ]]; then atom=${BASH_REMATCH[2]:-${BASH_REMATCH[1]}} [[ ${BASH_REMATCH[6]} != 0 ]] && atom+=-${BASH_REMATCH[6]} local regex="(^|\s|,)${atom}($|\s|,)"