aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2009-04-24 11:10:42 +0000
committerAlistair Bush <ali_bush@gentoo.org>2009-04-24 11:10:42 +0000
commit419d207b2b5dca5c400f150c0579aea4f1df5faf (patch)
treef334da606bd4a7c57e1977f4bc8418cb14541ce8 /src/java_config_2
parentAdd support for querying a packages package.env (diff)
downloadjava-config-419d207b2b5dca5c400f150c0579aea4f1df5faf.tar.gz
java-config-419d207b2b5dca5c400f150c0579aea4f1df5faf.tar.bz2
java-config-419d207b2b5dca5c400f150c0579aea4f1df5faf.zip
Add support for slotted java-virtuals.
svn path=/projects/java-config-2/trunk/; revision=7721
Diffstat (limited to 'src/java_config_2')
-rw-r--r--src/java_config_2/VersionManager.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/java_config_2/VersionManager.py b/src/java_config_2/VersionManager.py
index 4e4c440..cc82867 100644
--- a/src/java_config_2/VersionManager.py
+++ b/src/java_config_2/VersionManager.py
@@ -25,8 +25,6 @@ class VersionManager:
Used to parse dependency strings, and find the best/prefered vm to use.
"""
atom_parser = re.compile(r"([<>=]*)virtual/(jre|jdk)[-:]([0-9\.*]+)")
- #virtuals_parser = re.compile(r"([<>=]+)?java-virtuals/(.*?)")
- #virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/(.+)[\-:]([0-9\.*]+)")
virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
pref_files = ['/etc/java-config-2/build/jdk.conf', '/usr/share/java-config-2/config/jdk-defaults.conf']
_prefs = None
@@ -50,7 +48,6 @@ class VersionManager:
matched_atoms = []
atoms = self.filter_depend(atoms)
matches = self.atom_parser.findall(atoms)
- virtuals_matches = self.virtuals_parser.findall(atoms)
if len(matches) > 0:
for match in matches:
@@ -92,7 +89,7 @@ class VersionManager:
matched_virtuals = ""
for match in virtuals_matches:
- matched_virtuals += " " + match[1].replace(':', '-')
+ matched_virtuals += " " + match[1].replace(':0', '').replace(':', '-')
return matched_virtuals[1:]