diff options
author | 2020-06-17 22:47:36 +0200 | |
---|---|---|
committer | 2020-06-17 22:47:36 +0200 | |
commit | b885581550d77c38daa3ef7780c25c7ac1ad68e9 (patch) | |
tree | 2c2319f51c1e7ec96226723cc563f9d979ede17e | |
parent | update AUTHORS (diff) | |
download | java-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>
-rw-r--r-- | config/jdk.conf | 12 | ||||
-rw-r--r-- | setup.py | 1 | ||||
-rw-r--r-- | src/java_config_2/VersionManager.py | 6 |
3 files changed, 1 insertions, 18 deletions
diff --git a/config/jdk.conf b/config/jdk.conf deleted file mode 100644 index 0c42763..0000000 --- a/config/jdk.conf +++ /dev/null @@ -1,12 +0,0 @@ -# User jdk configuration file -# You can specify which jdk you prefer to use -# see http://www.gentoo.org/doc/en/java.xml#doc_chap4_sect3 for more info -# -# example: - -#1.3=sun-jdk-1.4 ibm-jdk-bin -#1.4=blackdown-jdk -#1.5=sun-jdk - -#or if you want everything with sun-jdk -#*=sun-jdk @@ -116,7 +116,6 @@ setup( (eprefix + '/usr/share/java-config-2/launcher', ['src/launcher.bash']), (eprefix + '/usr/share/man/man1/', ['man/java-config-2.1']), (eprefix + '/etc/java-config-2/', ['config/virtuals']), - (eprefix + '/etc/java-config-2/build', ['config/jdk.conf']) ] ) 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]]) |