[patch] jc_util patch to fix classpath problem

jc_util.patch (text/plain), 2.19 KB, created by Jason A. Mobarak (RETIRED) on 2004-01-24 23:46:10 UTC

Index: jc_options.py
===================================================================
RCS file: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_options.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jc_options.py	8 Nov 2003 23:07:33 -0000	1.9
+++ jc_options.py	9 Nov 2003 03:17:13 -0000	1.10
@@ -1,11 +1,11 @@
 # Author: Jason Mobarak
-# $Header: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_options.py,v 1.9 2003/11/08 23:07:33 kloeri Exp $
+# $Header: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_options.py,v 1.10 2003/11/09 03:17:13 strider Exp $
 import jc_iface
 import os
 import re
 from output import *
 
-__version__ = "$Revision: 1.9 $"[11:-2]
+__version__ = "$Revision: 1.10 $"[11:-2]
 
 env = os.environ
 JAVA_HOME = ''
@@ -525,7 +525,7 @@
 
 	# /etc/env.d/21java-classpath 
 
-	usage = ('Set the system classpath', 
+	usage = ('Append to the system classpath', 
 		 'Append the package names specified to the system ' +
 		 'classpath. Packages can be found with the ' +
 		 '--list-available-packages option.')
Index: jc_util.py
===================================================================
RCS file: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_util.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jc_util.py	25 Jan 2004 06:58:19 -0000	1.9
+++ jc_util.py	25 Jan 2004 07:01:38 -0000	1.10
@@ -1,6 +1,6 @@
-# $Header: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_util.py,v 1.9 2004/01/25 06:58:19 aether Exp $
+# $Header: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_util.py,v 1.10 2004/01/25 07:01:38 aether Exp $
 
-__version__ = "$Revision: 1.9 $"
+__version__ = "$Revision: 1.10 $"
 
 import os
 import re
@@ -142,12 +142,12 @@
 		pkg_env = collect_packages.pkg_env(pkg) 
 		classpath = None
 
-		if os.path.isfile(cp_env):
-			classpath = open(cp_env).read().strip()
-
-		elif os.path.isfile(pkg_env):
+		if os.path.isfile(pkg_env):
 			classpath = get_line_from_env_file('CLASSPATH', pkg_env) + ':'
 
+		elif os.path.isfile(cp_env):
+			classpath = open(cp_env).read().strip()
+
 		if classpath is None:
 			raise OptionRuntimeError, 'Could not find package %s' % pkg