1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d36e35dd83bf/ changeset: d36e35dd83bf user: greg date: 2013-01-18 16:16:20 summary: Fix circular repository dependency issue that so far uccurs only on the test tool shed. affected #: 1 file diff -r c86a704ba3f60bc51c9f998e0061d9b9f9507242 -r d36e35dd83bf18a47f26dc6eb779549c15782fbd lib/galaxy/util/shed_util_common.py --- a/lib/galaxy/util/shed_util_common.py +++ b/lib/galaxy/util/shed_util_common.py @@ -2779,6 +2779,7 @@ def populate_repository_dependency_objects_for_processing( trans, current_repository_key, repository_dependencies_dict, key_rd_dicts_to_be_processed, handled_key_rd_dicts, circular_repository_dependencies, all_repository_dependencies ): current_repository_key_rd_dicts = [] + filtered_current_repository_key_rd_dicts = [] for rd in repository_dependencies_dict[ 'repository_dependencies' ]: new_key_rd_dict = {} new_key_rd_dict[ current_repository_key ] = rd @@ -2790,6 +2791,7 @@ for key_rd_dict in current_repository_key_rd_dicts: is_circular = False if not in_key_rd_dicts( key_rd_dict, handled_key_rd_dicts ) and not in_key_rd_dicts( key_rd_dict, key_rd_dicts_to_be_processed ): + filtered_current_repository_key_rd_dicts.append( key_rd_dict ) repository_dependency = key_rd_dict[ current_repository_key ] if current_repository_key in all_repository_dependencies: # Add all repository dependencies for the current repository into it's entry in all_repository_dependencies. @@ -2813,7 +2815,7 @@ new_key_rd_dict = {} new_key_rd_dict[ current_repository_key ] = repository_dependency key_rd_dicts_to_be_processed.append( new_key_rd_dict ) - return current_repository_key_rd_dicts, key_rd_dicts_to_be_processed, handled_key_rd_dicts, all_repository_dependencies + return filtered_current_repository_key_rd_dicts, key_rd_dicts_to_be_processed, handled_key_rd_dicts, all_repository_dependencies def remove_dir( dir ): if os.path.exists( dir ): try: 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.