| 1 |
commit: af9620f533d988afa6fd7f0759390aca571bceef |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 29 21:43:55 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 29 21:43:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af9620f5 |
| 7 |
|
| 8 |
java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes |
| 9 |
|
| 10 |
eclass/java-utils-2.eclass | 2 +- |
| 11 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
| 14 |
index a09a8c951e8..25e35c33dd2 100644 |
| 15 |
--- a/eclass/java-utils-2.eclass |
| 16 |
+++ b/eclass/java-utils-2.eclass |
| 17 |
@@ -2907,7 +2907,7 @@ java-pkg_gen-cp() { |
| 18 |
|
| 19 |
local atom |
| 20 |
for atom in ${CP_DEPEND}; do |
| 21 |
- if [[ ${atom} =~ /(([[:alnum:]+_-]+)-[0-9]+(\.[0-9]+)*[a-z]?(_[[:alnum:]]+)?(-r[0-9]*)?|[[:alnum:]+_-]+):([[:alnum:]+_.-]+) ]]; then |
| 22 |
+ if [[ ${atom} =~ /(([[:alnum:]+_-]+)-[0-9]+(\.[0-9]+)*[a-z]?(_[[:alnum:]]+)*(-r[0-9]*)?|[[:alnum:]+_-]+):([[:alnum:]+_.-]+) ]]; then |
| 23 |
atom=${BASH_REMATCH[2]:-${BASH_REMATCH[1]}} |
| 24 |
[[ ${BASH_REMATCH[6]} != 0 ]] && atom+=-${BASH_REMATCH[6]} |
| 25 |
local regex="(^|\s|,)${atom}($|\s|,)" |
Archives