[gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass

[Petteri Raty (betelgeuse)]

betelgeuse    09/03/31 19:19:20

  Modified:             java-utils-2.eclass
  Log:
  Simply java-pkg_func-exists using suggestions by ciaranm and dberkholz on gentoo-dev.

Revision  Changes    Path
1.126                eclass/java-utils-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.125&r2=1.126

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- java-utils-2.eclass	27 Mar 2009 20:58:57 -0000	1.125
+++ java-utils-2.eclass	31 Mar 2009 19:19:20 -0000	1.126
@@ -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 @@
 				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 @@
 # @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
 }
 
 # ------------------------------------------------------------------------------