summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2017-12-29 21:43:55 +0000
committerJames Le Cuirot <chewi@gentoo.org>2017-12-29 21:43:55 +0000
commitaf9620f533d988afa6fd7f0759390aca571bceef (patch)
treea04488ac6347f3be0794f10096d888d0b082886d /eclass/java-utils-2.eclass
parentnet-im/gajim: Remove older testing version (diff)
downloadgentoo-af9620f533d988afa6fd7f0759390aca571bceef.tar.gz
gentoo-af9620f533d988afa6fd7f0759390aca571bceef.tar.bz2
gentoo-af9620f533d988afa6fd7f0759390aca571bceef.zip
java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes
Diffstat (limited to 'eclass/java-utils-2.eclass')
-rw-r--r--eclass/java-utils-2.eclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index a09a8c951e8e..25e35c33dd21 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|,)"