2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7117a2655ade/ Changeset: 7117a2655ade User: jmchilton Date: 2013-11-21 15:02:50 Summary: Fix model/check.py for app being None such as when using create_db.sh Thanks to Aaron Petkau for reporting this issue. Affected #: 1 file diff -r e6e9349e8da45a058fb5811eb89813694aeef729 -r 7117a2655ade212cfee20c9499d12b8ed5dc729b lib/galaxy/model/migrate/check.py --- a/lib/galaxy/model/migrate/check.py +++ b/lib/galaxy/model/migrate/check.py @@ -57,7 +57,7 @@ migrate_to_current_version( engine, db_schema ) meta = MetaData( bind=engine ) - if getattr( app.config, 'database_auto_migrate', False ): + if app and getattr( app.config, 'database_auto_migrate', False ): migrate() return https://bitbucket.org/galaxy/galaxy-central/commits/9a998cee3ea5/ Changeset: 9a998cee3ea5 User: jmchilton Date: 2013-11-21 15:05:36 Summary: Merge. Affected #: 1 file diff -r 7117a2655ade212cfee20c9499d12b8ed5dc729b -r 9a998cee3ea5acaf0f058b4743da37787c916594 test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -43,6 +43,7 @@ from functional_tests import generate_config_file from galaxy import eggs +from galaxy.util import unicodify eggs.require( "nose" ) eggs.require( "NoseHTML" ) @@ -1122,7 +1123,7 @@ # In keeping with the standard display layout, add the error message to the dict for each tool individually. for dependency in repository.missing_tool_dependencies: log.error( 'Missing tool dependency %s of type %s version %s: %s' % \ - ( str( dependency.name ), str( dependency.type ), str( dependency.version ), str( dependency.error_message ) ) ) + ( str( dependency.name ), str( dependency.type ), str( dependency.version ), unicodify( dependency.error_message ) ) ) test_result = dict( type=dependency.type, name=dependency.name, version=dependency.version, Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.