aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-03 13:56:08 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-03 13:56:08 +0000
commitba4f742336989d385b39019f155b557295dd7535 (patch)
tree67daea1947d9dd2edc3dd431bbdc48a0b56976cc
parentremove some code duplication (diff)
downloadjava-config-ba4f742336989d385b39019f155b557295dd7535.tar.gz
java-config-ba4f742336989d385b39019f155b557295dd7535.tar.bz2
java-config-ba4f742336989d385b39019f155b557295dd7535.zip
fix classpath setting
svn path=/java-config-ng/branches/axxo/; revision=302
-rw-r--r--src/java_config/EnvironmentManager.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/java_config/EnvironmentManager.py b/src/java_config/EnvironmentManager.py
index 725fa49..04b0e38 100644
--- a/src/java_config/EnvironmentManager.py
+++ b/src/java_config/EnvironmentManager.py
@@ -214,17 +214,15 @@ class EnvironmentManager:
def set_classpath(self, env_file, pkgs):
classpath = self.query_packages(pkgs, "CLASSPATH")
- classpath = re.sub(':+', ':', classpath)
- classpath.strip(':')
+ classpath = re.sub(':+', ':', ':'.join(classpath)).strip(':')
self.clean_classpath(env_file)
- self_write_classpath(env_file, classpath)
+ self.write_classpath(env_file, classpath)
def append_classpath(self, env_file, pkgs):
classpath = self.query_packages(pkgs, "CLASSPATH")
- classpath = re.sub(':+', ':', classpath)
- classpath.strip(':')
+ classpath = re.sub(':+', ':', ':'.join(classpath)).strip(':')
oldClasspath = ''
if os.path.isfile(env_file):
@@ -247,7 +245,7 @@ class EnvironmentManager:
self.clean_classpath(env_file)
- self_write_classpath(env_file, classpath)
+ self.write_classpath(env_file, classpath)
def write_classpath(self, env_file, classpath):
try: