From 9dbad8f623e5895b72acb74a8803caf7cbdfe283 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 9 Jan 2009 17:18:18 -0500 Subject: [PATCH] galaxy.config.resolve_path is not absolute... --- lib/galaxy/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 5adfb519f31..ae39dee6778 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -15,7 +15,7 @@ def resolve_path( path, root ): if not( os.path.isabs( path ) ): path = os.path.join( root, path ) return path - + class ConfigurationError( Exception ): pass @@ -44,7 +44,7 @@ class Configuration( object ): self.cluster_job_queue_workers = int( kwargs.get( "cluster_job_queue_workers", "5" ) ) self.job_scheduler_policy = kwargs.get("job_scheduler_policy", "FIFO") self.job_queue_cleanup_interval = int( kwargs.get("job_queue_cleanup_interval", "5") ) - self.cluster_files_directory = resolve_path( kwargs.get( "cluster_files_directory", "database/pbs" ), self.root ) + self.cluster_files_directory = os.path.abspath( kwargs.get( "cluster_files_directory", "database/pbs" ) ) self.job_working_directory = resolve_path( kwargs.get( "job_working_directory", "database/job_working_directory" ), self.root ) self.outputs_to_working_directory = string_as_bool( kwargs.get( 'outputs_to_working_directory', False ) ) self.admin_pass = kwargs.get('admin_pass',"galaxy")