diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-28 19:40:40 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-28 19:40:40 +0000 |
| commit | 57e3769779f01a1d0763cc194137994b75d5aac3 (patch) | |
| tree | 52ee138f85f99121a886dbed9535e3d0aa36deff /eclass/java-utils-2.eclass | |
| parent | Rename initd script to be more Gentoo like. Bump to add logrotate script than... (diff) | |
| download | gentoo-2-57e3769779f01a1d0763cc194137994b75d5aac3.tar.gz gentoo-2-57e3769779f01a1d0763cc194137994b75d5aac3.tar.bz2 gentoo-2-57e3769779f01a1d0763cc194137994b75d5aac3.zip | |
Support version globbing when checking dependencies, bug #315123.
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 785063ac102e..da5961016384 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.134 2010/04/01 22:29:28 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.135 2010/04/28 19:40:40 caster Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -2679,8 +2679,9 @@ java-pkg_ensure-dep() { local target_pkg="${2}" local dev_error="" + # remove the version specification, which may include globbing (* and [123]) local stripped_pkg=$(echo "${target_pkg}" | sed \ - 's/-[0-9]*\(\.[0-9]\)*$//') + 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//') debug-print "Matching against: ${stripped_pkg}" |