|
Lines 1-6
Link Here
|
| 1 |
# $Header: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_util.py,v 1.8 2004/01/16 12:15:28 aether Exp $ |
1 |
# $Header: /home/cvsroot/gentoo-src/java-config/python/java_config/jc_util.py,v 1.10 2004/01/25 07:01:38 aether Exp $ |
| 2 |
|
2 |
|
| 3 |
__version__ = "$Revision: 1.8 $" |
3 |
__version__ = "$Revision: 1.10 $" |
| 4 |
|
4 |
|
| 5 |
import os |
5 |
import os |
| 6 |
import re |
6 |
import re |
|
Lines 142-153
Link Here
|
| 142 |
pkg_env = collect_packages.pkg_env(pkg) |
142 |
pkg_env = collect_packages.pkg_env(pkg) |
| 143 |
classpath = None |
143 |
classpath = None |
| 144 |
|
144 |
|
| 145 |
if os.path.isfile(cp_env): |
145 |
if os.path.isfile(pkg_env): |
| 146 |
classpath = get_line_from_env_file('CLASSPATH', cp_env) + ':' |
|
|
| 147 |
|
| 148 |
elif os.path.isfile(pkg_env): |
| 149 |
classpath = get_line_from_env_file('CLASSPATH', pkg_env) + ':' |
146 |
classpath = get_line_from_env_file('CLASSPATH', pkg_env) + ':' |
| 150 |
|
147 |
|
|
|
148 |
elif os.path.isfile(cp_env): |
| 149 |
classpath = open(cp_env).read().strip() |
| 150 |
|
| 151 |
if classpath is None: |
151 |
if classpath is None: |
| 152 |
raise OptionRuntimeError, 'Could not find package %s' % pkg |
152 |
raise OptionRuntimeError, 'Could not find package %s' % pkg |
| 153 |
|
153 |
|
