commit/galaxy-central: inithello: Fix for incorrect path in dependent repository's env.sh when installing a repository with a complex repository dependency specifying a changeset revision that has been superseded by an updated downloadable changeset revision.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/53cf170463b4/ Changeset: 53cf170463b4 User: inithello Date: 2013-04-19 20:01:51 Summary: Fix for incorrect path in dependent repository's env.sh when installing a repository with a complex repository dependency specifying a changeset revision that has been superseded by an updated downloadable changeset revision. Affected #: 1 file diff -r 7b8beadc5221774104b396d34d069a41390bc553 -r 53cf170463b4cdddf09b9cec369f2a82998d3535 lib/tool_shed/galaxy_install/tool_dependencies/install_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/install_util.py @@ -182,14 +182,15 @@ tool_shed = package_elem.attrib[ 'toolshed' ] required_repository_name = package_elem.attrib[ 'name' ] required_repository_owner = package_elem.attrib[ 'owner' ] - required_repository_changeset_revision = package_elem.attrib[ 'changeset_revision' ] + default_required_repository_changeset_revision = package_elem.attrib[ 'changeset_revision' ] required_repository = get_tool_shed_repository_by_tool_shed_name_owner_changeset_revision( app, tool_shed, required_repository_name, required_repository_owner, - required_repository_changeset_revision ) + default_required_repository_changeset_revision ) tmp_filename = None if required_repository: + required_repository_changeset_revision = required_repository.installed_changeset_revision # Define the installation directory for the required tool dependency package in the required repository. required_repository_package_install_dir = \ get_tool_dependency_install_dir( app=app, @@ -257,7 +258,7 @@ install_and_build_package_via_fabric( app, tool_dependency, actions_dict ) else: message = "Unable to locate required tool shed repository named %s owned by %s with revision %s." % \ - ( str( required_repository_name ), str( required_repository_owner ), str( required_repository_changeset_revision ) ) + ( str( required_repository_name ), str( required_repository_owner ), str( default_required_repository_changeset_revision ) ) raise Exception( message ) elif package_elem.tag == 'install': # <install version="1.0"> 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.
participants (1)
-
commits-noreply@bitbucket.org