opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes to scripts for config subdir.

Browse Source
This commit is contained in:
Nate Coraor
2014-09-15 16:52:50 -04:00
parent 8fadc6392b
commit bc5ec4fec4
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/helper.py
+2 -3
View File
@@ -26,8 +26,7 @@ except:
sys.exit( 1 )
options.config = os.path.abspath( options.config )
os.chdir( os.path.dirname( options.config ) )
sys.path.append( 'lib' )
sys.path.append( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
from galaxy import eggs
import pkg_resources
@@ -35,7 +34,7 @@ import pkg_resources
config = ConfigParser( dict( file_path = 'database/files',
id_secret = 'USING THE DEFAULT IS NOT SECURE!',
database_connection = 'sqlite:///database/universe.sqlite?isolation_level=IMMEDIATE' ) )
config.read( os.path.basename( options.config ) )
config.read( options.config )
from galaxy.web import security
from galaxy.model import mapping
scripts/set_dataset_sizes.py
+2 -3
View File
@@ -13,15 +13,14 @@ parser.add_option( '-c', '--config', dest='config', help='Path to Galaxy config
def init():
options.config = os.path.abspath( options.config )
os.chdir( os.path.dirname( options.config ) )
sys.path.append( 'lib' )
sys.path.append( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
from galaxy import eggs
import pkg_resources
config = ConfigParser( dict( file_path = 'database/files',
database_connection = 'sqlite:///database/universe.sqlite?isolation_level=IMMEDIATE' ) )
config.read( os.path.basename( options.config ) )
config.read( options.config )
from galaxy.model import mapping
scripts/set_user_disk_usage.py
+2 -3
View File
@@ -21,8 +21,7 @@ def init():
if options.email == 'all':
options.email = None
os.chdir( os.path.dirname( options.config ) )
sys.path.append( 'lib' )
sys.path.append( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) )
from galaxy import eggs
import pkg_resources
@@ -35,7 +34,7 @@ def init():
config_parser = ConfigParser( dict( here = os.getcwd(),
database_connection = 'sqlite:///database/universe.sqlite?isolation_level=IMMEDIATE' ) )
config_parser.read( os.path.basename( options.config ) )
config_parser.read( options.config )
config_dict = {}
for key, value in config_parser.items( "app:main" ):