diff options
Diffstat (limited to 'src/java_config_2')
| -rw-r--r-- | src/java_config_2/EnvironmentManager.py | 1 | ||||
| -rw-r--r-- | src/java_config_2/VersionManager.py | 2 | ||||
| -rw-r--r-- | src/java_config_2/Virtual.py | 24 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/java_config_2/EnvironmentManager.py b/src/java_config_2/EnvironmentManager.py index c482efb..5cac238 100644 --- a/src/java_config_2/EnvironmentManager.py +++ b/src/java_config_2/EnvironmentManager.py @@ -67,6 +67,7 @@ class EnvironmentManager(object): def load_package(self, name): try: + name = name.replace(':', '-') pkg = Package(name, '/usr/share/' + name + '/package.env') self.packages[name] = pkg return pkg diff --git a/src/java_config_2/VersionManager.py b/src/java_config_2/VersionManager.py index e795b28..192439a 100644 --- a/src/java_config_2/VersionManager.py +++ b/src/java_config_2/VersionManager.py @@ -142,7 +142,7 @@ class VersionManager: def get_vm(self, atoms, need_virtual = None): matched_atoms = self.parse_depend(atoms) matched_virtuals = self.parse_depend_virtuals(atoms) - #print "matched_virtuals=" + matched_virtuals + print "matched_virtuals=" + matched_virtuals if len(matched_atoms) == 0: return None if len(matched_virtuals) == 0: diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py index 050f9bf..1e6a31d 100644 --- a/src/java_config_2/Virtual.py +++ b/src/java_config_2/Virtual.py @@ -98,7 +98,7 @@ class Virtual(Package): return self._vms def get_available_vms(self): - return self.available_vms + return self._vms def target(self): """ @@ -107,11 +107,11 @@ class Virtual(Package): if self.min_target: return self.min_target #Big Big Hack - return "1.4" - #try: - # return self.get_provider().query("TARGET") - #except EnvironmentUndefinedError: - # return self.get_provider().query("PROVIDES_VERSION") + #return "1.4" + try: + return self.get_provider().query("TARGET") + except EnvironmentUndefinedError: + return self.get_provider().query("PROVIDES_VERSION") def classpath(self): @@ -126,7 +126,9 @@ class Virtual(Package): return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"] else: raise ProviderUnavailableError( self._name, self.providing_vms, self.providing_packages ) - return "" + else: + raise + #return "" def query(self, var): """ @@ -138,11 +140,11 @@ class Virtual(Package): return self.classpath() if var == "TARGET": return self.min_target - try: - return self.get_provider().query(var) + #try: + return self.get_provider().query(var) #except EnvironmentUndefinedError: - except: - return self._config["VM"] + #except: + # return self._config["VM"] def deps(self): """ |