From bc460f36a70cd5e79633e2c4bb903de6c465b5cb Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Thu, 26 Jun 2014 11:52:42 -0400 Subject: [PATCH] Add the ability to uninstall a Tool Shed repository installed into Galaxy but in an error state. --- lib/galaxy/model/tool_shed_install/__init__.py | 4 +++- lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/model/tool_shed_install/__init__.py b/lib/galaxy/model/tool_shed_install/__init__.py index a37b001d014..475c8bb503a 100644 --- a/lib/galaxy/model/tool_shed_install/__init__.py +++ b/lib/galaxy/model/tool_shed_install/__init__.py @@ -68,7 +68,9 @@ class ToolShedRepository( object ): @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 --git a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py index f621335a029..9da421a8f35 100644 --- 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 @@ class InstalledRepositoryGrid( grids.Grid ): 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',