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

[Petteri Raty (betelgeuse)]

betelgeuse    08/10/10 20:11:46

  Modified:             java-utils-2.eclass
  Log:
  Run java-config --help to see if the user hasn't run python-updater.

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

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

Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- java-utils-2.eclass	5 Oct 2008 16:53:38 -0000	1.115
+++ java-utils-2.eclass	10 Oct 2008 20:11:46 -0000	1.116
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.115 2008/10/05 16:53:38 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.116 2008/10/10 20:11:46 betelgeuse Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -2062,6 +2062,14 @@
 	unset JAVAC
 	unset JAVA_HOME
 
+	java-config --help >/dev/null || {
+		eerror ""
+		eerror "Can't run java-config --help"
+		eerror "Have you upgraded python recently but haven't"
+		eerror "run python-updater yet?"
+		die "Can't run java-config --help"
+	}
+
 	# People do all kinds of weird things.
 	# http://forums.gentoo.org/viewtopic-p-3943166.html
 	local silence="${SILENCE_JAVA_OPTIONS_WARNING}"