1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/af1c29ddf98a/ Changeset: af1c29ddf98a User: greg Date: 2013-07-12 16:15:50 Summary: Fix for determining if the only difference between rd_tup and a dependency definition in the list of repository_dependencies is the changeset_revision value. Affected #: 1 file diff -r a7edac403b6c7befb1721f06c99dd1ced30b45c3 -r af1c29ddf98ac92fc92393af150be73409f63f0b lib/tool_shed/util/metadata_util.py --- a/lib/tool_shed/util/metadata_util.py +++ b/lib/tool_shed/util/metadata_util.py @@ -214,7 +214,7 @@ if not found_in_current: # In some cases, the only difference between a dependency definition in the lists is the changeset_revision value. We'll # check to see if this is the case, and if the defined dependency is a repository that has metadata set only on it's tip. - if not different_revision_defines_tip_only_repository_dependency( ancestor_tup, current_repository_dependencies ): + if not different_revision_defines_tip_only_repository_dependency( trans, ancestor_tup, current_repository_dependencies ): return NOT_EQUAL_AND_NOT_SUBSET return SUBSET if len( ancestor_repository_dependencies ) == len( current_repository_dependencies ): @@ -346,7 +346,7 @@ break return repository_metadata -def different_revision_defines_tip_only_repository_dependency( rd_tup, repository_dependencies ): +def different_revision_defines_tip_only_repository_dependency( trans, rd_tup, repository_dependencies ): """ Determine if the only difference between rd_tup and a dependency definition in the list of repository_dependencies is the changeset_revision value. """ @@ -1331,7 +1331,7 @@ if saved_repository_dependency not in new_repository_dependencies: # In some cases, the only difference between a dependency definition in the lists is the changeset_revision value. We'll # check to see if this is the case, and if the defined dependency is a repository that has metadata set only on it's tip. - if not different_revision_defines_tip_only_repository_dependency( saved_repository_dependency, new_repository_dependencies ): + if not different_revision_defines_tip_only_repository_dependency( trans, saved_repository_dependency, new_repository_dependencies ): return True return False else: 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.