summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/java-utils-2.eclass')
-rw-r--r--eclass/java-utils-2.eclass17
1 files changed, 7 insertions, 10 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 23fd20a6632d..50da444ca206 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.151 2012/07/05 20:07:47 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.152 2013/01/16 19:06:15 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2606,15 +2606,12 @@ java-pkg_build-vm-from-handle() {
debug-print-function ${FUNCNAME} "$*"
local vm
- vm=$(java-pkg_get-current-vm)
- if [[ $? != 0 ]]; then
- eerror "${FUNCNAME}: Failed to get active vm"
- return 1
- fi
-
- if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
- echo ${vm}
- return 0
+ vm=$(java-pkg_get-current-vm 2>/dev/null)
+ if [[ $? -eq 0 ]]; then
+ if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
+ echo ${vm}
+ return 0
+ fi
fi
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do