diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-10-30 11:06:38 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-10-30 11:06:38 +0000 |
| commit | 15eaacd8d9e1ff72fb1116d6a2c98e070adb99e4 (patch) | |
| tree | 36c9c6a8aeeda0082d348b608f00afe6e07d8894 /eclass | |
| parent | Specify libnl slot, bug 388625 (diff) | |
| download | gentoo-2-15eaacd8d9e1ff72fb1116d6a2c98e070adb99e4.tar.gz gentoo-2-15eaacd8d9e1ff72fb1116d6a2c98e070adb99e4.tar.bz2 gentoo-2-15eaacd8d9e1ff72fb1116d6a2c98e070adb99e4.zip | |
Remove false alarms on system-vm removal due to GENTOO_VM set for icedtea build.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-vm-2.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index fddca287981e..a22f77673d9a 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -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_set-nsplugin() { 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!" |