1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/1da8fb882393/ changeset: 1da8fb882393 user: greg date: 2012-07-13 18:12:08 summary: Pritorize tools first, followed by proprietary datatypes and then workflows when setting metadata on tool shed repositories. affected #: 1 file diff -r 28b3364341b66ae9e3628d965db31c8dc3c57bfd -r 1da8fb882393c68f83d08f6c85023a0c3225513b lib/galaxy/webapps/community/controllers/common.py --- a/lib/galaxy/webapps/community/controllers/common.py +++ b/lib/galaxy/webapps/community/controllers/common.py @@ -279,6 +279,10 @@ # Handle case where all metadata is the same. if ancestor_guids == current_guids and workflow_comparison == 'equal' and datatype_comparison == 'equal': return 'equal' + """ + # TODO: revisit after GCC - we temporarily prioritize contents as: 1) tools 2) datatypes 3) workflows + # by only inspecting tools if they exist. If tools don't exist, next inspect only datatypes and, finally, workflows. + # Here is the original code, with the code following the commented code replacing it. if workflow_comparison == 'subset' and datatype_comparison == 'subset': is_subset = True for guid in ancestor_guids: @@ -287,6 +291,24 @@ break if is_subset: return 'subset' + """ + if ancestor_guids and current_guids: + is_subset = True + for guid in ancestor_guids: + if guid not in current_guids: + is_subset = False + break + if is_subset: + return 'subset' + else: + return 'not equal and not subset' + elif ancestor_guids and not current_guids: + # There were tools in the ancestor changeset revision, but no tools in the current changeset revision, so no new metadata should be generated. + return 'subset' + elif datatype_comparison == 'subset': + return 'subset' + elif workflow_comparison == 'subset': + return 'subset' return 'not equal and not subset' def compare_datatypes( ancestor_datatypes, current_datatypes ): # Determine if ancestor_datatypes is the same as current_datatypes 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.