[galaxy-commits] commit/galaxy-central: greg: Eliminate check for more than 1 file in a changeset when determining if a repository can be of type tool_dependency_definition since mercurial will sometimes have the same file name twice in the changeset depending upon the operation being performed. Also enhance the error message process when loading invalid tools in the tool shed to not display the same error more than once for a specific tool.

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d3832bec213c/ Changeset: d3832bec213c User: greg Date: 2013-07-13 14:56:33 Summary: Eliminate check for more than 1 file in a changeset when determining if a repository can be of type tool_dependency_definition since mercurial will sometimes have the same file name twice in the changeset depending upon the operation being performed. Also enhance the error message process when loading invalid tools in the tool shed to not display the same error more than once for a specific tool. Affected #: 2 files diff -r a0ea8ac5583cd295266eac38a12da4d9fd7613ac -r d3832bec213c031ea12eaf3d2292a5363e9e88b9 lib/tool_shed/repository_types/tool_dependency_definition.py --- a/lib/tool_shed/repository_types/tool_dependency_definition.py +++ b/lib/tool_shed/repository_types/tool_dependency_definition.py @@ -33,8 +33,6 @@ ctx = repo.changectx( changeset ) # Inspect all files in the changeset (in sorted order) to make sure there is only one and it is named tool_dependencies.xml. files_changed_in_changeset = ctx.files() - if len( files_changed_in_changeset ) > 1: - return False for file_path in files_changed_in_changeset: file_name = suc.strip_path( file_path ) if file_name not in self.valid_file_names: diff -r a0ea8ac5583cd295266eac38a12da4d9fd7613ac -r d3832bec213c031ea12eaf3d2292a5363e9e88b9 lib/tool_shed/util/tool_util.py --- a/lib/tool_shed/util/tool_util.py +++ b/lib/tool_shed/util/tool_util.py @@ -157,7 +157,9 @@ else: correction_msg = "This file requires an entry in the tool_data_table_conf.xml file. Upload a file named tool_data_table_conf.xml.sample " correction_msg += "to the repository that includes the required entry to correct this error.<br/>" - invalid_files_and_errors_tups.append( ( tool_config_name, correction_msg ) ) + invalid_tup = ( tool_config_name, correction_msg ) + if invalid_tup not in invalid_files_and_errors_tups: + invalid_files_and_errors_tups.append( invalid_tup ) if options.index_file or options.missing_index_file: # Make sure the repository contains the required xxx.loc.sample file. index_file = options.index_file or options.missing_index_file 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.