2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1a87b74d4f42/ Changeset: 1a87b74d4f42 Branch: next-stable User: natefoo Date: 2014-09-25 20:23:06+00:00 Summary: Fix bug in finding relocated tool_data_table_conf.xml Affected #: 1 file diff -r fdcefd1c3661ea71661584e7bcc03f33022641d1 -r 1a87b74d4f428ac25dfe5517506ec16bfa9a1bc4 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -394,7 +394,7 @@ ) listify_defaults = dict( - tool_data_table_config_path = [ 'config/tool_data_table_conf.xml', 'config/tool_data_table_conf.xml', 'config/tool_data_table_conf.xml.sample' ], + tool_data_table_config_path = [ 'config/tool_data_table_conf.xml', 'tool_data_table_conf.xml', 'config/tool_data_table_conf.xml.sample' ], # rationale: # [0]: user has explicitly created config/tool_conf.xml but did not # move their existing shed_tool_conf.xml, don't use https://bitbucket.org/galaxy/galaxy-central/commits/f52d7d6d64a6/ Changeset: f52d7d6d64a6 User: natefoo Date: 2014-09-25 20:23:31+00:00 Summary: Merge next-stable. Affected #: 1 file diff -r f02fcf8a931c4862cfb6698da0e097d68c8025c6 -r f52d7d6d64a671039a85959e1c720445f0ee672e lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -394,7 +394,7 @@ ) listify_defaults = dict( - tool_data_table_config_path = [ 'config/tool_data_table_conf.xml', 'config/tool_data_table_conf.xml', 'config/tool_data_table_conf.xml.sample' ], + tool_data_table_config_path = [ 'config/tool_data_table_conf.xml', 'tool_data_table_conf.xml', 'config/tool_data_table_conf.xml.sample' ], # rationale: # [0]: user has explicitly created config/tool_conf.xml but did not # move their existing shed_tool_conf.xml, don't use 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.