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

[Ralph Sennhauser]

commit:     8bc6acaf1226e7b76140dda4c67fcf04290a0a7e
Author:     Ralph Sennhauser <sera <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 10:05:01 2013 +0000
Commit:     Ralph Sennhauser <sera <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 12:28:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/java-config.git;a=commit;h=8bc6acaf

Deprecation notice for setting system and user vm

Adopt deprecation_notice for:
  --set-system-vm
  --set-user-vm

Users are adviced to use eselect java-vm instead.

---
 src/java-config-2 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java-config-2 b/src/java-config-2
index 81e50b3..62a34ef 100755
--- a/src/java-config-2
+++ b/src/java-config-2
@@ -175,6 +175,8 @@ def print_environment(option, opt, value, parser):
         fatalError("Could not find a vm matching: %s" % value)
 
 def set_system_vm(option, opt, value, parser):
+    deprecation_notice()
+
     vm = manager.get_vm(value)
 
     if not vm:
@@ -194,6 +196,8 @@ def set_system_vm(option, opt, value, parser):
             fatalError("Target file already exists and is not a symlink: %s" % e.file)
 
 def set_user_vm(option, opt, value, parser):
+    deprecation_notice()
+
     vm = manager.get_vm(value)
 
     if not vm:
@@ -224,7 +228,7 @@ def select_vm(option, opt, value, parser):
         fatalError("The vm could not be found")
 
 def deprecation_notice():
-    printer._printWarning("Setting a user and system classpath is deprecated, this option will be removed from future versions.")
+    printer._printWarning("Setting user and system vm using java-config is deprecated, use eselect java-vm instead.")
 
 def fatalError(msg):
     printer._printError(msg)