diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-03-31 19:19:20 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-03-31 19:19:20 +0000 |
| commit | df77c6b7b2cf83006a516a62ee0ac736acc7c557 (patch) | |
| tree | a5d5f445c3c38e4315200fe0c749e01c4c1dae5b /eclass/java-utils-2.eclass | |
| parent | Remove old. (diff) | |
| download | gentoo-2-df77c6b7b2cf83006a516a62ee0ac736acc7c557.tar.gz gentoo-2-df77c6b7b2cf83006a516a62ee0ac736acc7c557.tar.bz2 gentoo-2-df77c6b7b2cf83006a516a62ee0ac736acc7c557.zip | |
Simply java-pkg_func-exists using suggestions by ciaranm and dberkholz on gentoo-dev.
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 2072a539ae03..f2f5e09e9991 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.125 2009/03/27 20:58:57 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.126 2009/03/31 19:19:20 betelgeuse Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -367,6 +367,7 @@ java-pkg_regjar() { eerror "has * in it. If you want it to glob in" eerror '${D} add ${D} to the argument.' fi + debug-print "${jar} or ${D}${jar} not found" die "${jar} does not exist" fi done @@ -2449,11 +2450,7 @@ java-pkg_expand_dir_() { # @return 1 - function is undeclared # ------------------------------------------------------------------------------ java-pkg_func-exists() { - if [[ -n "$(declare -f ${1})" ]]; then - return 0 - else - return 1 - fi + declare -F ${1} > /dev/null } # ------------------------------------------------------------------------------ |