1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/1f1cd76dd19c/ changeset: 1f1cd76dd19c user: greg date: 2012-04-17 20:41:56 summary: Fix for setting tool versions and fix for setting repository metadata for tools in an installed repository. affected #: 2 files

diff -r f633230e1397476c11c8a2ecba7da7a035b030ac -r 1f1cd76dd19cc19d5e76c0560da3ccedb796b8cf lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -410,13 +410,17 @@ full_path = os.path.abspath( os.path.join( root, name ) ) if not ( check_binary( full_path ) or check_image( full_path ) or check_gzip( full_path )[ 0 ] or check_bz2( full_path )[ 0 ] or check_zip( full_path ) ): - try: - tool = toolbox.load_tool( full_path ) - except Exception, e: - tool = None - if tool is not None: - tool_config = os.path.join( root, name ) - metadata_dict = generate_tool_metadata( tool_config, tool, repository_clone_url, metadata_dict ) + # Make sure we're looking at a tool config and not a display application config or something else. + element_tree = util.parse_xml( full_path ) + element_tree_root = element_tree.getroot() + if element_tree_root.tag == 'tool': + try: + tool = toolbox.load_tool( full_path ) + except Exception, e: + tool = None + if tool is not None: + tool_config = os.path.join( root, name ) + metadata_dict = generate_tool_metadata( tool_config, tool, repository_clone_url, metadata_dict ) # Find all exported workflows elif name.endswith( '.ga' ): relative_path = os.path.join( root, name )

diff -r f633230e1397476c11c8a2ecba7da7a035b030ac -r 1f1cd76dd19cc19d5e76c0560da3ccedb796b8cf lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -838,7 +838,7 @@ tool_version_dicts.append( repository_metadata.tool_versions ) if current_changeset_revision == changeset_revision: break - if repository_metadata.tool_versions: + if tool_version_dicts: return to_json_string( tool_version_dicts ) return '' @web.expose

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.