/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.151 Revision 1.152
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2011, Gentoo Foundation 5# Copyright (c) 2004-2011, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.151 2012/07/05 20:07:47 sera Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.152 2013/01/16 19:06:15 sera Exp $
10 10
11# ----------------------------------------------------------------------------- 11# -----------------------------------------------------------------------------
12# @eclass-begin 12# @eclass-begin
13# @eclass-shortdesc Java Utility eclass 13# @eclass-shortdesc Java Utility eclass
14# @eclass-maintainer java@gentoo.org 14# @eclass-maintainer java@gentoo.org
2604# ------------------------------------------------------------------------------ 2604# ------------------------------------------------------------------------------
2605java-pkg_build-vm-from-handle() { 2605java-pkg_build-vm-from-handle() {
2606 debug-print-function ${FUNCNAME} "$*" 2606 debug-print-function ${FUNCNAME} "$*"
2607 2607
2608 local vm 2608 local vm
2609 vm=$(java-pkg_get-current-vm) 2609 vm=$(java-pkg_get-current-vm 2>/dev/null)
2610 if [[ $? != 0 ]]; then 2610 if [[ $? -eq 0 ]]; then
2611 eerror "${FUNCNAME}: Failed to get active vm"
2612 return 1
2613 fi
2614
2615 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then 2611 if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
2616 echo ${vm} 2612 echo ${vm}
2617 return 0 2613 return 0
2614 fi
2618 fi 2615 fi
2619 2616
2620 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do 2617 for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
2621 if java-config-2 --select-vm=${vm} 2>/dev/null; then 2618 if java-config-2 --select-vm=${vm} 2>/dev/null; then
2622 echo ${vm} 2619 echo ${vm}

Legend:
Removed from v.1.151  
changed lines
  Added in v.1.152

  ViewVC Help
Powered by ViewVC 1.1.20