summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-10-10 20:11:46 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-10-10 20:11:46 +0000
commitf77f7e58e58b20dcd2243e1a1742a76cca8be3e7 (patch)
treefb59e28a563fb00a617bf102e3b86081f820a5c8 /eclass
parentFix race in XPCE manual generation (diff)
downloadgentoo-2-f77f7e58e58b20dcd2243e1a1742a76cca8be3e7.tar.gz
gentoo-2-f77f7e58e58b20dcd2243e1a1742a76cca8be3e7.tar.bz2
gentoo-2-f77f7e58e58b20dcd2243e1a1742a76cca8be3e7.zip
Run java-config --help to see if the user hasn't run python-updater.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-utils-2.eclass10
1 files changed, 9 insertions, 1 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 15e07fe4755f..8385fc67c585 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -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 @@ java-pkg_init() {
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}"