galaxy.config.resolve_path is not absolute...

This commit is contained in:
Nate Coraor
2009-01-09 17:18:18 -05:00
parent 2f0f2dfb9a
commit 9dbad8f623
+2 -2
View File
@@ -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")