2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/252027d00b44/ Changeset: 252027d00b44 Branch: next-stable User: greg Date: 2013-05-22 22:11:55 Summary: Populate the toolshed attribute when it is missing from the repository tag in dependency definitions with the current tool shed url. Affected #: 1 file diff -r 2aea26f69ba8c39d726adc32c6163e806ba33817 -r 252027d00b441db33005080860970c3441399a77 lib/tool_shed/util/commit_util.py --- a/lib/tool_shed/util/commit_util.py +++ b/lib/tool_shed/util/commit_util.py @@ -6,6 +6,7 @@ from galaxy import util from galaxy.datatypes import checkers from galaxy.util import json +from galaxy.web import url_for import tool_shed.util.shed_util_common as suc from tool_shed.util import tool_util @@ -219,6 +220,12 @@ def handle_repository_dependency_elem( trans, elem ): # <repository name="molecule_datatypes" owner="test" changeset_revision="1a070566e9c6" /> populated = False + toolshed = elem.get( 'toolshed' ) + if not toolshed: + # Default the setting to the current tool shed. + toolshed = str( url_for( '/', qualified=True ) ).rstrip( '/' ) + elem.attrib[ 'toolshed' ] = toolshed + populated = True name = elem.get( 'name' ) owner = elem.get( 'owner' ) changeset_revision = elem.get( 'changeset_revision' ) https://bitbucket.org/galaxy/galaxy-central/commits/ee040d597798/ Changeset: ee040d597798 User: greg Date: 2013-05-22 22:12:30 Summary: Merged from next-stable Affected #: 1 file diff -r f5b320301daa6e2cd74c54ab0bdd7a2145f92ba1 -r ee040d59779808ec5d748f3df04377b333b74a54 lib/tool_shed/util/commit_util.py --- a/lib/tool_shed/util/commit_util.py +++ b/lib/tool_shed/util/commit_util.py @@ -6,6 +6,7 @@ from galaxy import util from galaxy.datatypes import checkers from galaxy.util import json +from galaxy.web import url_for import tool_shed.util.shed_util_common as suc from tool_shed.util import tool_util @@ -219,6 +220,12 @@ def handle_repository_dependency_elem( trans, elem ): # <repository name="molecule_datatypes" owner="test" changeset_revision="1a070566e9c6" /> populated = False + toolshed = elem.get( 'toolshed' ) + if not toolshed: + # Default the setting to the current tool shed. + toolshed = str( url_for( '/', qualified=True ) ).rstrip( '/' ) + elem.attrib[ 'toolshed' ] = toolshed + populated = True name = elem.get( 'name' ) owner = elem.get( 'owner' ) changeset_revision = 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.