commit/galaxy-central: greg: Fix for getting updates for tool shed repositories installed into a local Galaxy instance.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/23107188eab8/ changeset: 23107188eab8 user: greg date: 2012-09-18 19:54:19 summary: Fix for getting updates for tool shed repositories installed into a local Galaxy instance. affected #: 1 file diff -r 2f655fb9e6a8873f1faff3b0fed4c0288a2e4c2b -r 23107188eab8aa8f0c5ed721af30ff13b19bd61c lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -795,19 +795,25 @@ changeset_hash = str( repo.changectx( changeset ) ) ctx = get_changectx_for_changeset( repo, changeset_hash ) if update_to_changeset_hash: - if get_repository_metadata_by_changeset_revision( trans, trans.security.encode_id( repository.id ), changeset_hash ): - # We found a RepositoryMetadata record. - if changeset_hash == repository.tip: - # The current ctx is the repository tip, so use it. + if changeset_hash == repository.tip: + update_to_ctx = get_changectx_for_changeset( repo, changeset_hash ) + latest_changeset_revision = changeset_hash + break + else: + repository_metadata = get_repository_metadata_by_changeset_revision( trans, + trans.security.encode_id( repository.id ), + changeset_hash ) + if repository_metadata: + # We found a RepositoryMetadata record. update_to_ctx = get_changectx_for_changeset( repo, changeset_hash ) latest_changeset_revision = changeset_hash + break else: - update_to_ctx = get_changectx_for_changeset( repo, update_to_changeset_hash ) - latest_changeset_revision = update_to_changeset_hash - break - elif not update_to_changeset_hash and changeset_hash == changeset_revision: - # We've found the changeset in the changelog for which we need to get the next update. - update_to_changeset_hash = changeset_hash + update_to_changeset_hash = changeset_hash + else: + if changeset_hash == changeset_revision: + # We've found the changeset in the changelog for which we need to get the next update. + update_to_changeset_hash = changeset_hash if from_update_manager: if latest_changeset_revision == changeset_revision: return no_update 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.
participants (1)
-
Bitbucket