1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/49195c2f37ce/ changeset: 49195c2f37ce user: greg date: 2012-04-21 03:27:34 summary: Fixes for setting repository metadata on older change sets in a tool shed repository. affected #: 2 files diff -r 6f7240344304a143a3d70182092c61931595b613 -r 49195c2f37cedabd034984b08058b163302286f0 lib/galaxy/webapps/community/controllers/common.py --- a/lib/galaxy/webapps/community/controllers/common.py +++ b/lib/galaxy/webapps/community/controllers/common.py @@ -401,10 +401,14 @@ fh.close() if not ( check_binary( tmp_filename ) or check_image( tmp_filename ) or check_gzip( tmp_filename )[ 0 ] or check_bz2( tmp_filename )[ 0 ] or check_zip( tmp_filename ) ): - # Make sure we're looking at a tool config and not a display application config or something else. - element_tree = util.parse_xml( tmp_filename ) - element_tree_root = element_tree.getroot() - if element_tree_root.tag == 'tool': + try: + # Make sure we're looking at a tool config and not a display application config or something else. + element_tree = util.parse_xml( tmp_filename ) + element_tree_root = element_tree.getroot() + is_tool = element_tree_root.tag == 'tool' + except: + is_tool = False + if is_tool: try: tool = load_tool( trans, tmp_filename ) valid = True diff -r 6f7240344304a143a3d70182092c61931595b613 -r 49195c2f37cedabd034984b08058b163302286f0 lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -919,10 +919,14 @@ fh.close() if not ( check_binary( tmp_filename ) or check_image( tmp_filename ) or check_gzip( tmp_filename )[ 0 ] or check_bz2( tmp_filename )[ 0 ] or check_zip( tmp_filename ) ): - # Make sure we're looking at a tool config and not a display application config or something else. - element_tree = util.parse_xml( tmp_filename ) - element_tree_root = element_tree.getroot() - if element_tree_root.tag == 'tool': + try: + # Make sure we're looking at a tool config and not a display application config or something else. + element_tree = util.parse_xml( tmp_filename ) + element_tree_root = element_tree.getroot() + is_tool = element_tree_root.tag == 'tool' + except: + is_tool = False + if is_tool: try: tool = load_tool( trans, tmp_filename ) valid = True 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.