diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-12-29 22:08:41 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-12-29 22:08:41 +0000 |
| commit | 10d666b5da71156d49455349d8f6398b07a5c282 (patch) | |
| tree | c9735535affe850ae8ef0d085733b6218720eb28 | |
| parent | 2017-12-29 21:46:38 UTC (diff) | |
| parent | java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes (diff) | |
| download | gentoo-10d666b5da71156d49455349d8f6398b07a5c282.tar.gz gentoo-10d666b5da71156d49455349d8f6398b07a5c282.tar.bz2 gentoo-10d666b5da71156d49455349d8f6398b07a5c282.zip | |
Merge updates from master
| -rw-r--r-- | eclass/java-utils-2.eclass | 2 |
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|,)" |