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

[Petteri Raty (betelgeuse)]

betelgeuse    07/11/26 21:00:59

  Modified:             java-utils-2.eclass
  Log:
  Can't use export with JAVA_OPTIONS so just put back the unset. The warning given to users should be enough even if the unset does not currently work.

Revision  Changes    Path
1.98                 eclass/java-utils-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.97&r2=1.98

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- java-utils-2.eclass	26 Nov 2007 20:38:26 -0000	1.97
+++ java-utils-2.eclass	26 Nov 2007 21:00:59 -0000	1.98
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.98 2007/11/26 21:00:59 betelgeuse Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -2067,7 +2067,9 @@
 	fi
 
 	if [[ -z ${accept} ]]; then
-		export _JAVA_OPTIONS=
+		# export _JAVA_OPTIONS= doesn't work because it will show up in java
+		# -version output
+		unset _JAVA_OPTIONS
 		# phase hooks make this run many times without this
 		I_WANT_GLOBAL_JAVA_OPTIONS="true"
 	fi



-- 
gentoo-commits@g.o mailing list