2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/632b55655358/ Changeset: 632b55655358 Branch: next-stable User: Dave Bouvier Date: 2013-05-20 22:50:32 Summary: Fix for uploading repository_dependencies.xml without a changeset revision specified when the target repository's latest downloadable changeset revision is followed by two or more non-downloadable changeset revisions. Affected #: 1 file diff -r 7c42691969906be88d5ac290b3e922a19ddf54af -r 632b55655358ee532777a6af0f7ed781905a67d1 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -497,7 +497,10 @@ repository_metadata = get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), repository_tip ) if repository_metadata and repository_metadata.downloadable: return repository_tip - return get_previous_metadata_changeset_revision( repository, repo, repository_tip, downloadable=True ) + changeset_revisions = get_ordered_metadata_changeset_revisions( repository, repo, downloadable=True ) + if changeset_revisions: + return changeset_revisions[ -1 ] + return INITIAL_CHANGELOG_HASH def get_named_tmpfile_from_ctx( ctx, filename, dir ): """Return a named temporary file created from a specified file with a given name included in a repository changeset revision.""" @@ -583,7 +586,7 @@ rev = '-1' changeset_tups.append( ( rev, changeset_revision ) ) sorted_changeset_tups = sorted( changeset_tups ) - sorted_changeset_revisions = [ changeset_tup[ 1 ] for changeset_tup in sorted_changeset_tups ] + sorted_changeset_revisions = [ str( changeset_tup[ 1 ] ) for changeset_tup in sorted_changeset_tups ] return sorted_changeset_revisions def get_previous_metadata_changeset_revision( repository, repo, before_changeset_revision, downloadable=True ): https://bitbucket.org/galaxy/galaxy-central/commits/2b456e221582/ Changeset: 2b456e221582 User: Dave Bouvier Date: 2013-05-20 22:51:05 Summary: Merged in bugfix from next-stable. Affected #: 1 file diff -r 5e89080bc9fa7eccc7ec1d4c8ac6da3657ce457e -r 2b456e2215824614a974f481ef22506ad99267e9 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -497,7 +497,10 @@ repository_metadata = get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), repository_tip ) if repository_metadata and repository_metadata.downloadable: return repository_tip - return get_previous_metadata_changeset_revision( repository, repo, repository_tip, downloadable=True ) + changeset_revisions = get_ordered_metadata_changeset_revisions( repository, repo, downloadable=True ) + if changeset_revisions: + return changeset_revisions[ -1 ] + return INITIAL_CHANGELOG_HASH def get_named_tmpfile_from_ctx( ctx, filename, dir ): """Return a named temporary file created from a specified file with a given name included in a repository changeset revision.""" @@ -583,7 +586,7 @@ rev = '-1' changeset_tups.append( ( rev, changeset_revision ) ) sorted_changeset_tups = sorted( changeset_tups ) - sorted_changeset_revisions = [ changeset_tup[ 1 ] for changeset_tup in sorted_changeset_tups ] + sorted_changeset_revisions = [ str( changeset_tup[ 1 ] ) for changeset_tup in sorted_changeset_tups ] return sorted_changeset_revisions def get_previous_metadata_changeset_revision( repository, repo, before_changeset_revision, downloadable=True ): 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.