Re: [gentoo-java] eselect java broken?

[Caster <cast3r@seznam.cz>]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

Joshua Nichols wrote:
> You forgot to attach the patch :)
> 

Damn :) Here it is.

> But it's moot, since I just barely fixed it before seeing your message.
>> But then I've run into another problem. It allows root to set user-vm as
>> well as system-vm, while java-config-2 doesn't. java-config-2 then lists
>> it as active with java-config -L (probably causes other problems too).
>> There's no way to unset it but removing /root/.gentoo/java-config-2
>> So, eselect java shouldn't list or allow changing of user-vm for root.
>> Haven't tried to fix that.
>>
>>   
> Right you are. It should die now if you try to set a user vm as root.
> 
> On a related note, it seems that the eselect module sets stuff by hand,
> ie by creating symlinks and whatnot. I'm not sure if this was
> intentional, or if it should be using java-config to do this instead.
> 

Using java-config to set stuff would be easy. To list stuff, it would
need to parse its output. I'm not even sure if an user can determine
system-vm with java-config. Maybe use the python functions that
java-config uses?

> In any event, thanks for the report. This is exactly the stuff I want to
> be found and fixed before we merge the migration-overlay into the main
> tree.
> 

Glad to help :)

Caster

[-- Attachment #2: java.eselect.diff --]
[-- Type: text/plain, Size: 1051 bytes --]

--- java.eselect.2.0.22	2006-05-09 19:17:02.000000000 +0200
+++ java.eselect.fixed	2006-05-09 19:16:00.000000000 +0200
@@ -10,8 +10,8 @@
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
 VM_BASE=/usr/lib/jvm/
-VM_SYSTEM=/etc/java-config/system-vm
-VM_USER=${HOME}/.gentoo/user-vm
+VM_SYSTEM=/etc/java-config-2/current-system-vm
+VM_USER=${HOME}/.gentoo/java-config-2/current-user-vm
 
 find_targets() {
 	local f
@@ -67,12 +67,14 @@
 		[[ -L ${VM_USER} ]] && user_name=$(sym_to_vm ${VM_USER})
 
 		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+			mark="";
 			if [[ ${targets[${i}]} == ${system_name} ]]; then
-				targets[${i}]="${targets[${i}]} $(highlight 'system-vm')"
+				mark="${mark} $(highlight 'system-vm')";
 			fi
-			if [[ ${targets[${i}]} == ${user_user} ]]; then
-				targets[${i}]="${targets[${i}]} $(highlight 'user-vm' )"
+			if [[ ${targets[${i}]} == ${user_name} ]]; then
+				mark="${mark} $(highlight 'user-vm')";
 			fi
+			targets[${i}]="${targets[${i}]} ${mark}"
 		done
 		write_numbered_list "${targets[@]}"
 	else