aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2020-06-17 22:47:36 +0200
committerPatrice Clement <monsieurp@gentoo.org>2020-06-17 22:47:36 +0200
commitb885581550d77c38daa3ef7780c25c7ac1ad68e9 (patch)
tree2c2319f51c1e7ec96226723cc563f9d979ede17e /src
parentupdate AUTHORS (diff)
downloadjava-config-b885581550d77c38daa3ef7780c25c7ac1ad68e9.tar.gz
java-config-b885581550d77c38daa3ef7780c25c7ac1ad68e9.tar.bz2
java-config-b885581550d77c38daa3ef7780c25c7ac1ad68e9.zip
remove jdk.conf and its references
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'src')
-rw-r--r--src/java_config_2/VersionManager.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/java_config_2/VersionManager.py b/src/java_config_2/VersionManager.py
index d2319d8..cb30e88 100644
--- a/src/java_config_2/VersionManager.py
+++ b/src/java_config_2/VersionManager.py
@@ -52,7 +52,6 @@ class VersionManager:
def __init__(self, env_manager):
self.env_manager = env_manager
- self.user_pref_file = env_manager.eprefix + '/etc/java-config-2/build/jdk.conf'
self.default_pref_file = env_manager.eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf'
self._prefs = None
@@ -61,10 +60,7 @@ class VersionManager:
return self._prefs
else:
self._prefs = []
- # first try the build preferences
- if os.path.exists(self.user_pref_file):
- self._prefs += PrefsFileParser(self.user_pref_file).get_config()
- # then try system vm
+ # try system vm
sys_vm = self.env_manager.system_vm_name()
if sys_vm is not None:
self._prefs.append(['*', [sys_vm]])