aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2007-10-20 12:03:01 +0000
committerAlistair Bush <ali_bush@gentoo.org>2007-10-20 12:03:01 +0000
commit90931049754da8479cefa46e470d4e8498bd846c (patch)
tree1f1ac41e5fb2ecc153b6016dd0a0fa0ebab96bad
parentFix issue when EnvironmentManager does not compile with python-2.4 but does w... (diff)
downloadjava-config-90931049754da8479cefa46e470d4e8498bd846c.tar.gz
java-config-90931049754da8479cefa46e470d4e8498bd846c.tar.bz2
java-config-90931049754da8479cefa46e470d4e8498bd846c.zip
Updated virtuals conf examples and fixed issue in Virtual.py where incorrect active_package was being selected.
svn path=/projects/java-config-2/trunk/; revision=5494
-rw-r--r--config/virtuals3
-rw-r--r--src/java_config_2/Virtual.py1
2 files changed, 2 insertions, 2 deletions
diff --git a/config/virtuals b/config/virtuals
index 7aafd0b..c2e3992 100644
--- a/config/virtuals
+++ b/config/virtuals
@@ -1,5 +1,4 @@
# Example:
#
#javamail=gnu-javamail-1
-#javamail=sun-javamail-bin
-#jaf=sun-jaf-bin
+#javamail=sun-javamail
diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py
index bc286db..d89bedd 100644
--- a/src/java_config_2/Virtual.py
+++ b/src/java_config_2/Virtual.py
@@ -180,6 +180,7 @@ class Virtual(Package):
# Improvement: we could put the VM in the list of providers
if self._manager.get_package(package) is not None:
self.active_package = self._manager.get_package(package)
+ break
# Set the minimum target version to the active package's target.
if self.active_package:
self.min_target = self.active_package.query("TARGET")