diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-08-01 12:23:57 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-08-01 12:23:57 +0000 |
| commit | 6f527deb05abf5399c9fe00f27312aba4b67f017 (patch) | |
| tree | 323e6d167ad48ed1afb2f4739d3bcbe87a854f27 /eclass/java-vm-2.eclass | |
| parent | Revision bump to support new Java system by Caster <cast3r@seznam.cz>. Also i... (diff) | |
| download | gentoo-2-6f527deb05abf5399c9fe00f27312aba4b67f017.tar.gz gentoo-2-6f527deb05abf5399c9fe00f27312aba4b67f017.tar.bz2 gentoo-2-6f527deb05abf5399c9fe00f27312aba4b67f017.zip | |
Reverted a change to the check during pkg_postinst that reset the system vm if it was the package being upgraded. Uses a bash-3 specific feature, so added it to DEPEND.
Diffstat (limited to 'eclass/java-vm-2.eclass')
| -rw-r--r-- | eclass/java-vm-2.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 9332f778b4fa..f745f40e52c9 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.5 2006/07/15 13:55:06 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.6 2006/08/01 12:23:57 nichoj Exp $ # # Author: Karl Trygve Kalleberg <karltk@gentoo.org> @@ -12,7 +12,8 @@ DEPEND=" >=sys-apps/portage-2.1" RDEPEND=" =dev-java/java-config-2.0* - =dev-java/java-config-1.3*" + =dev-java/java-config-1.3* + >=sys-apps/bash-3" export WANT_JAVA_CONFIG=2 @@ -40,7 +41,7 @@ java-vm-2_pkg_postinst() { einfo "No valid generation-1 system-vm set, setting to ${P}" java-config-1 --set-system-vm=${P} # dirty check to see if we are upgrading current generation-1 system vm - elif [[ x${systemvm1} = x${VMHANDLE} ]]; then + elif [[ ${systemvm1} =~ "^${VMHANDLE}" ]]; then einfo "Upgrading generation-1 system-vm... updating its env file" java-config-1 --set-system-vm=${P} fi |