commit/galaxy-central: greg: Allow tool shed repository dependency definition tags to not include a toolshed attribute. If missing, the toolshed value will default to the current tool shed. The following example shows what was required before this changeset:
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/842a78530fcd/ Changeset: 842a78530fcd User: greg Date: 2013-05-14 19:45:08 Summary: Allow tool shed repository dependency definition tags to not include a toolshed attribute. If missing, the toolshed value will default to the current tool shed. The following example shows what was required before this changeset: <repository toolshed="http://localhost:9009/" name="molecule_datatypes" owner="test" changeset_revision="1a070566e9c6" /> Now the following is also valid: <repository name="molecule_datatypes" owner="test" changeset_revision="1a070566e9c6" /> Affected #: 1 file diff -r d3be8f8f8096ad723644019bd742904046df54ba -r 842a78530fcd87670198d55d96d9adbdfc53483e lib/tool_shed/util/metadata_util.py --- a/lib/tool_shed/util/metadata_util.py +++ b/lib/tool_shed/util/metadata_util.py @@ -9,6 +9,7 @@ from galaxy.tools.data_manager.manager import DataManager from galaxy.util import inflector from galaxy.util import json +from galaxy.web import url_for from galaxy.webapps.tool_shed.util import container_util import tool_shed.util.shed_util_common as suc from tool_shed.util import common_util @@ -1050,6 +1051,9 @@ is_valid = True error_message = '' toolshed = repository_elem.get( 'toolshed' ) + if not toolshed: + # Default to the current tool shed. + toolshed = str( url_for( '/', qualified=True ) ).rstrip( '/' ) name = repository_elem.get( 'name' ) owner = repository_elem.get( 'owner' ) changeset_revision = repository_elem.get( 'changeset_revision' ) 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