Fix scripts that use galaxy.model.orm.scripts' get_config method to find either config/galaxy.ini or universe_wsgi.ini. For the tool_shed database it'll find either config/tool_shed.ini or tool_shed_wsgi.ini. Also re-fix the unit test.

Database and tool migrations won't work if you use galaxy.ini.sample. Perhaps it should automatically try appending .sample? Or we should really be encouraging people to use the config file properly.
This commit is contained in:
Nate Coraor
2014-09-17 01:33:17 -04:00
parent ddca49767d
commit d294af4866
2 changed files with 13 additions and 6 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ from galaxy.model.orm.scripts import read_config_file_arg
log = logging.getLogger( __name__ )
config_file = read_config_file_arg( sys.argv, 'config/galaxy.ini' )
config_file = read_config_file_arg( sys.argv, 'config/galaxy.ini', 'universe_wsgi.ini' )
if not os.path.exists( config_file ):
print "Galaxy config file does not exist (hint: use '-c config.ini' for non-standard locations): %s" % config_file
sys.exit( 1 )