From fc17db50cc54a7521e24ecbb4d6e145a283ad919 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 16 Jan 2014 13:00:30 -0600 Subject: [PATCH] Fix database engine options when verifying tools using separate install database. Bug report and fix thanks to Jim Johnson. --- lib/galaxy/config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 1d0e7d7e2cc..3ce11476fc9 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -602,7 +602,11 @@ class ConfiguresGalaxyMixin: if check_migrate_tools: # Alert the Galaxy admin to tools that have been moved from the distribution to the tool shed. from tool_shed.galaxy_install.migrate.check import verify_tools - verify_tools( self, install_db_url, config_file, self.config.database_engine_options ) + if combined_install_database: + install_database_options = self.config.database_engine_options + else: + install_database_options = self.config.install_database_engine_options + verify_tools( self, install_db_url, config_file, install_database_options ) from galaxy.model import mapping self.model = mapping.init( self.config.file_path,