1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/ed6104097dc9/ changeset: ed6104097dc9 user: greg date: 2013-02-22 21:19:47 summary: Fix for deleting and undeleting repositories in the tool shed: if deleting, all installable revisions are marked as not installable, and if undeleting, all revisions are inspected and those determined to be installable are marked accordingly. affected #: 1 file

diff -r 3bdb4291e5e666c4d4b86e184b4599e61b847864 -r ed6104097dc9b9c519f71a392225e7ed45bfede3 lib/galaxy/webapps/community/controllers/admin.py --- a/lib/galaxy/webapps/community/controllers/admin.py +++ b/lib/galaxy/webapps/community/controllers/admin.py @@ -586,12 +586,17 @@ deleted_repositories = "" for repository_id in ids: repository = suc.get_repository_in_tool_shed( trans, repository_id ) - if not repository.deleted: - repository.deleted = True - trans.sa_session.add( repository ) - trans.sa_session.flush() - count += 1 - deleted_repositories += " %s " % repository.name + if repository: + if not repository.deleted: + # Mark all installable repository_metadata records as not installable. + for repository_metadata in repository.downloadable_revisions: + repository_metadata.downloadable = False + trans.sa_session.add( repository_metadata ) + repository.deleted = True + trans.sa_session.add( repository ) + trans.sa_session.flush() + count += 1 + deleted_repositories += " %s " % repository.name if count: message = "Deleted %d %s: %s" % ( count, inflector.cond_plural( len( ids ), "repository" ), deleted_repositories ) else: @@ -740,12 +745,20 @@ undeleted_repositories = "" for repository_id in ids: repository = suc.get_repository_in_tool_shed( trans, repository_id ) - if repository.deleted: - repository.deleted = False - trans.sa_session.add( repository ) - trans.sa_session.flush() - count += 1 - undeleted_repositories += " %s" % repository.name + if repository: + if repository.deleted: + # Inspect all repository_metadata records to determine those that are installable, and mark them accordingly. + for repository_metadata in repository.metadata_revisions: + metadata = repository_metadata.metadata + if metadata: + if suc.is_downloadable( metadata ): + repository_metadata.downloadable = True + trans.sa_session.add( repository_metadata ) + repository.deleted = False + trans.sa_session.add( repository ) + trans.sa_session.flush() + count += 1 + undeleted_repositories += " %s" % repository.name if count: message = "Undeleted %d %s: %s" % ( count, inflector.cond_plural( count, "repository" ), undeleted_repositories ) 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.