aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2013-02-08 16:15:23 +0000
committerRalph Sennhauser <sera@gentoo.org>2013-02-08 16:15:23 +0000
commit8703f7dd4dcf1eca9f5bfa181761107a47b375aa (patch)
treefc82af33ae4d1772d442f598dd9c8165856a1fd6
parentDrop EnvironmentManager singlton hack and so really fix VersionManager to not... (diff)
downloadjava-config-8703f7dd4dcf1eca9f5bfa181761107a47b375aa.tar.gz
java-config-8703f7dd4dcf1eca9f5bfa181761107a47b375aa.tar.bz2
java-config-8703f7dd4dcf1eca9f5bfa181761107a47b375aa.zip
Respect recorded JVM from RDEPEND in gjl, fixes bug 455798.
svn path=/projects/java-config-2/trunk/; revision=9183
-rwxr-xr-xsrc/gjl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gjl b/src/gjl
index 17cd9ea..b030074 100755
--- a/src/gjl
+++ b/src/gjl
@@ -153,7 +153,7 @@ def target_matches_any( targets, vm ):
return accept
# Options:
-def get_vm(pkg):
+def get_vm_orig(pkg):
target, needs_jdk = get_needed_target2(pkg)
active_vm = manager.get_active_vm()
if len( needs_jdk ):
@@ -181,6 +181,9 @@ def get_vm(pkg):
#else:
# return verman.get_vm(pkg.query("VM"))
+def get_vm(pkg):
+ return verman.get_vm(pkg.query('VM'))
+
def get_args(pkg):
args=""