commit/galaxy-central: greg: Fix for generating metadata in a tool shed repository for a change set that contains data types but is not the repository tip.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/1a9ee49d6612/ changeset: 1a9ee49d6612 user: greg date: 2012-02-28 19:41:01 summary: Fix for generating metadata in a tool shed repository for a change set that contains data types but is not the repository tip. affected #: 1 file diff -r 7f320a462a92d4c97b710d84b6977f49c5c481a7 -r 1a9ee49d66127b78aa5923dcbcdaed43b5c53b75 lib/galaxy/webapps/community/controllers/common.py --- a/lib/galaxy/webapps/community/controllers/common.py +++ b/lib/galaxy/webapps/community/controllers/common.py @@ -346,15 +346,25 @@ metadata_dict = {} invalid_files = [] sample_files = [] - datatypes_config = None + tmp_datatypes_config = None # Find datatypes_conf.xml if it exists. for filename in ctx: if filename == 'datatypes_conf.xml': fctx = ctx[ filename ] - datatypes_config = fctx.data() + # Write the contents of datatypes_config.xml to a temporary file. + fh = tempfile.NamedTemporaryFile( 'w' ) + tmp_datatypes_config = fh.name + fh.close() + fh = open( tmp_datatypes_config, 'w' ) + fh.write( fctx.data() ) + fh.close() break - if datatypes_config: - metadata_dict = generate_datatypes_metadata( datatypes_config, metadata_dict ) + if tmp_datatypes_config: + metadata_dict = generate_datatypes_metadata( tmp_datatypes_config, metadata_dict ) + try: + os.unlink( tmp_datatypes_config ) + except: + pass # Get all tool config file names from the hgweb url, something like: # /repos/test/convert_chars1/file/e58dcf0026c7/convert_characters.xml for filename in ctx: 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)
-
Bitbucket