[patch] jc_util patch

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

Index: jc_util.py
===================================================================
RCS file: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_util.py,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- jc_util.py	16 Jan 2004 12:15:28 -0000	1.8
+++ 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.8 2004/01/16 12:15:28 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.8 $"
+__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 = get_line_from_env_file('CLASSPATH', cp_env) + ':'
-
-		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