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

[Vlastimil Babka (caster)]

caster      11/10/30 11:06:38

  Modified:             java-vm-2.eclass
  Log:
  Remove false alarms on system-vm removal due to GENTOO_VM set for icedtea build.

Revision  Changes    Path
1.36                 eclass/java-vm-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.35&r2=1.36

Index: java-vm-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- java-vm-2.eclass	29 Oct 2011 14:36:34 -0000	1.35
+++ java-vm-2.eclass	30 Oct 2011 11:06:38 -0000	1.36
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.35 2011/10/29 14:36:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.36 2011/10/30 11:06:38 caster Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -96,7 +96,7 @@
 
 java-vm-2_pkg_prerm() {
 	# Although REPLACED_BY_VERSION is EAPI=4, we shouldn't need to check EAPI for this use case
-	if [[ "$(java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then
+	if [[ "$(GENTOO_VM="" java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then
 		ewarn "It appears you are removing your system-vm!"
 		ewarn "Please run java-config -L to list available VMs,"
 		ewarn "then use java-config -S to set a new system-vm!"