projects
/
gentoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7695e6b
)
java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes
author
James Le Cuirot
<chewi@gentoo.org>
Fri, 29 Dec 2017 21:43:55 +0000
(21:43 +0000)
committer
James Le Cuirot
<chewi@gentoo.org>
Fri, 29 Dec 2017 21:43:55 +0000
(21:43 +0000)
eclass/java-utils-2.eclass
patch
|
blob
|
history
diff --git
a/eclass/java-utils-2.eclass
b/eclass/java-utils-2.eclass
index a09a8c951e8e057f1fef3e69a6831be9ec3b9d43..25e35c33dd2145c739655237df735be4122b08a5 100644
(file)
--- 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|,)"