1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/e54f7684c919/ changeset: e54f7684c919 user: greg date: 2012-07-02 21:28:28 summary: Fix for creating or updating a tool_shed_repository db record. affected #: 1 file
diff -r 0bf342288c79f417e7fbb6e0e7ac992024936e6e -r e54f7684c919f1556bec34521b4ccffac0602792 lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -330,6 +330,15 @@ if not owner: owner = get_repository_owner_from_clone_url( repository_clone_url ) includes_datatypes = 'datatypes' in metadata_dict + if status in [ app.model.ToolShedRepository.installation_status.DEACTIVATED ]: + deleted = True + uninstalled = False + elif status in [ app.model.ToolShedRepository.installation_status.UNINSTALLED ]: + deleted = True + uninstalled = True + else: + deleted = False + uninstalled = False tool_shed_repository = get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( app, tool_shed, name, @@ -341,22 +350,9 @@ tool_shed_repository.ctx_rev = ctx_rev tool_shed_repository.metadata = metadata_dict tool_shed_repository.includes_datatypes = includes_datatypes + tool_shed_repository.deleted = deleted + tool_shed_repository.uninstalled = uninstalled tool_shed_repository.status = status - if status in [ app.model.ToolShedRepository.installation_status.NEW, - app.model.ToolShedRepository.installation_status.CLONING, - app.model.ToolShedRepository.installation_status.SETTING_TOOL_VERSIONS, - app.model.ToolShedRepository.installation_status.INSTALLING_TOOL_DEPENDENCIES, - app.model.ToolShedRepository.installation_status.LOADING_PROPRIETARY_DATATYPES, - app.model.ToolShedRepository.installation_status.INSTALLED, - app.model.ToolShedRepository.installation_status.ERROR ]: - tool_shed_repository.deleted = False - tool_shed_repository.uninstalled = False - elif status in [ app.model.ToolShedRepository.installation_status.DEACTIVATED ]: - tool_shed_repository.deleted = True - tool_shed_repository.uninstalled = False - elif status in [ app.model.ToolShedRepository.installation_status.UNINSTALLED ]: - tool_shed_repository.deleted = True - tool_shed_repository.uninstalled = True else: tool_shed_repository = app.model.ToolShedRepository( tool_shed=tool_shed, name=name,
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.