summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-07-01 20:28:43 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-07-01 20:28:43 +0000
commit667750721efedff3e7e56900af48873d0911bb90 (patch)
tree6393d6caefd5e60b040a09846a2dc49c62f46339
parentVersion bump, see bug #134165. (diff)
downloadgentoo-2-667750721efedff3e7e56900af48873d0911bb90.tar.gz
gentoo-2-667750721efedff3e7e56900af48873d0911bb90.tar.bz2
gentoo-2-667750721efedff3e7e56900af48873d0911bb90.zip
Made the message printed when there's a problem finding the generation-1 system vm slightly nicer.
-rw-r--r--eclass/java-pkg.eclass11
1 files changed, 5 insertions, 6 deletions
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass
index f61c0509166f..f2dd720e53d0 100644
--- a/eclass/java-pkg.eclass
+++ b/eclass/java-pkg.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-pkg.eclass,v 1.37 2006/06/25 21:01:36 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.38 2006/07/01 20:28:43 nichoj Exp $
inherit multilib
@@ -33,11 +33,10 @@ java-pkg_pkg_setup() {
einfo "Using ${GENTOO_VM}"
eend 0
else
- eerror "There was a problem determining which VM to use for Generation-1"
- eerror "See the list of available VMs by using: java-config-1 -L"
- eerror "Then select on of those by using: java-config-1 -S <selected vm>"
- eerror "And once that is done, run: env-update && source /etc/profile"
- eerror "Then to continue the emerge: emerge --resume"
+ eerror "There was a problem determining which VM to use for generation-1"
+ eerror "You may need to set your generation-1 VM again, and run env-update && source/etc/profile"
+ eerror "Also, make sure you have followed the Java Upgrade Guide:"
+ eerror "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
eend 1
die "Couldn't determine VM for generation-1"
fi