1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/60be24933d59/
Changeset: 60be24933d59
User: greg
Date: 2014-06-27 13:06:48
Summary: Make sure a repository exists before checking its status - thanks to Nicola Soranzo for finding this issue.
Affected #: 1 file
diff -r 6577911a2230fd33b40031300af6214b52bf3058 -r 60be24933d59806e355d64a5156327021027772d lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -1268,8 +1268,8 @@
new_kwd = {}
if repository_id is not None:
repository = suc.get_installed_tool_shed_repository( trans.app, repository_id )
- if repository.is_new:
- if repository:
+ if repository:
+ if repository.is_new:
if kwd.get( 'purge_repository_button', False ):
irm = trans.app.installed_repository_manager
purge_status, purge_message = irm.purge_repository( repository )
@@ -1283,10 +1283,10 @@
repository=repository )
else:
new_kwd[ 'status' ] = 'error'
- new_kwd[ 'message' ] = 'Cannot locate the database record for the repository with encoded id %s.' % str( repository_id )
+ new_kwd[ 'message' ] = 'Repositories must have a <b>New</b> status in order to be purged.'
else:
new_kwd[ 'status' ] = 'error'
- new_kwd[ 'message' ] = 'Repositories must have a <b>New</b> status in order to be purged.'
+ new_kwd[ 'message' ] = 'Cannot locate the database record for the repository with encoded id %s.' % str( repository_id )
else:
new_kwd[ 'status' ] = 'error'
new_kwd[ 'message' ] = 'Invalid repository id value "None" received for repository to be purged.'
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e9c28dc0e692/
Changeset: e9c28dc0e692
User: greg
Date: 2014-06-26 17:52:42
Summary: Add the ability to uninstall a Tool Shed repository installed into Galaxy but in an error state.
Affected #: 2 files
diff -r 24d60b6d10fffb69b49c008b71af9dd3b3a4fda1 -r e9c28dc0e6924e7d617041700dec99258f025261 lib/galaxy/model/tool_shed_install/__init__.py
--- a/lib/galaxy/model/tool_shed_install/__init__.py
+++ b/lib/galaxy/model/tool_shed_install/__init__.py
@@ -68,7 +68,9 @@
@property
def can_deactivate( self ):
- return self.status not in [ self.installation_status.DEACTIVATED, self.installation_status.UNINSTALLED ]
+ return self.status not in [ self.installation_status.DEACTIVATED,
+ self.installation_status.ERROR,
+ self.installation_status.UNINSTALLED ]
@property
def can_reinstall_or_activate( self ):
diff -r 24d60b6d10fffb69b49c008b71af9dd3b3a4fda1 -r e9c28dc0e6924e7d617041700dec99258f025261 lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
--- a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
+++ b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py
@@ -194,9 +194,7 @@
grids.GridOperation( label="Deactivate or uninstall",
condition=( lambda item: \
not item.deleted and \
- item.status not in \
- [ tool_shed_install.ToolShedRepository.installation_status.ERROR,
- tool_shed_install.ToolShedRepository.installation_status.NEW ] ),
+ item.status != tool_shed_install.ToolShedRepository.installation_status.NEW ),
allow_multiple=False,
url_args=dict( controller='admin_toolshed',
action='browse_repositories',
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/24d60b6d10ff/
Changeset: 24d60b6d10ff
User: greg
Date: 2014-06-26 16:59:47
Summary: Fix for purging a repository in Galaxy installed from the Tool Shed.
Affected #: 1 file
diff -r ba9452fd7e6119e4958fa2ddd10e45f6739c725a -r 24d60b6d10fffb69b49c008b71af9dd3b3a4fda1 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -1271,7 +1271,7 @@
repository = suc.get_installed_tool_shed_repository( trans.app, repository_id )
if repository:
if kwd.get( 'purge_repository', False ):
- irm = install_manager.InstallRepositoryManager( trans.app )
+ irm = trans.app.installed_repository_manager
purge_status, purge_message = irm.purge_repository( trans.app, repository )
if purge_status == 'ok':
new_kwd[ 'status' ] = "done"
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.