1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/f673cb8e75d9/ changeset: f673cb8e75d9 user: greg date: 2012-07-11 17:53:22 summary: Fixes for installing tool dependencies, and uninstalling repositories and tool dependencies. affected #: 2 files
diff -r 005f732eb00f76e7d1319dfb8288953aff9b8939 -r f673cb8e75d9978ef069fd0dcad9ee0dc065ac6e lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -1210,6 +1210,8 @@ ElementInclude.include( root ) fabric_version_checked = False for elem in root: + # Only install the package if it is not already installed. + can_install = False if elem.tag == 'package': package_name = elem.get( 'name', None ) package_version = elem.get( 'version', None ) @@ -1217,8 +1219,6 @@ # The value of tool_dependencies will be None only when this method is called by the InstallManager. In that case, tool # dependency installation is not ajaxian, so the ToolDependency objects do not yet exist. if tool_dependencies: - # Only install the package if it is not already installed. - can_install = False for tool_dependency in tool_dependencies: if tool_dependency.name==package_name and tool_dependency.version==package_version: can_install = tool_dependency.status in [ app.model.ToolDependency.installation_status.NEVER_INSTALLED, @@ -1457,6 +1457,7 @@ log.debug( error_message ) if removed: tool_dependency.status = trans.model.ToolDependency.installation_status.UNINSTALLED + tool_dependency.error_message = None trans.sa_session.add( tool_dependency ) trans.sa_session.flush() return removed, error_message
diff -r 005f732eb00f76e7d1319dfb8288953aff9b8939 -r f673cb8e75d9978ef069fd0dcad9ee0dc065ac6e lib/galaxy/web/controllers/admin_toolshed.py --- a/lib/galaxy/web/controllers/admin_toolshed.py +++ b/lib/galaxy/web/controllers/admin_toolshed.py @@ -437,6 +437,7 @@ tool_shed_repository.deleted = True if remove_from_disk_checked: tool_shed_repository.status = trans.model.ToolShedRepository.installation_status.UNINSTALLED + tool_shed_repository.error_message = None else: tool_shed_repository.status = trans.model.ToolShedRepository.installation_status.DEACTIVATED trans.sa_session.add( tool_shed_repository )
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.