[gentoo-commits] proj/java-config:master commit in: /, config/, src/java_config_2/

[gentoo-commits] proj/java-config:master commit in: /, config/, src/java_config_2/

[Patrice Clement]

commit:     b885581550d77c38daa3ef7780c25c7ac1ad68e9
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 20:47:36 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 20:47:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/java-config.git/commit/?id=b8855815

remove jdk.conf and its references

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 config/jdk.conf                     | 12 ------------
 setup.py                            |  1 -
 src/java_config_2/VersionManager.py |  6 +-----
 3 files changed, 1 insertion(+), 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

diff --git a/setup.py b/setup.py
index c1dd9a0..ff50b37 100644
--- a/setup.py
+++ b/setup.py
@@ -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]])