From 5914524b9ebfda93fdf678be7f626e005d16f040 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 1 Apr 2015 16:56:29 -0400 Subject: [PATCH 1/2] Fix error in toolshed metadata generator reported by @martenson --- lib/tool_shed/metadata/metadata_generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tool_shed/metadata/metadata_generator.py b/lib/tool_shed/metadata/metadata_generator.py index 079f4e11adc..0c0575c7dd5 100644 --- a/lib/tool_shed/metadata/metadata_generator.py +++ b/lib/tool_shed/metadata/metadata_generator.py @@ -456,8 +456,8 @@ class MetadataGenerator( object ): try: exported_workflow_dict = json.loads( workflow_text ) except Exception, e: - log.exception( "Skipping file %s since it does not seem to be a valid exported Galaxy workflow: %s" \ - % str( relative_path ), str( e ) ) + log.exception( "Skipping file %s since it does not seem to be a valid exported Galaxy workflow: %s" + % (str( relative_path ), str( e ) ) ) valid_exported_galaxy_workflow = False if valid_exported_galaxy_workflow and \ 'a_galaxy_workflow' in exported_workflow_dict and \ From b307de98b7d530e1e5a8a2aefc8156761da38e83 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 1 Apr 2015 17:31:14 -0400 Subject: [PATCH 2/2] Fix spacing to follow our guidelines. --- lib/tool_shed/metadata/metadata_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tool_shed/metadata/metadata_generator.py b/lib/tool_shed/metadata/metadata_generator.py index 0c0575c7dd5..07135309082 100644 --- a/lib/tool_shed/metadata/metadata_generator.py +++ b/lib/tool_shed/metadata/metadata_generator.py @@ -457,7 +457,7 @@ class MetadataGenerator( object ): exported_workflow_dict = json.loads( workflow_text ) except Exception, e: log.exception( "Skipping file %s since it does not seem to be a valid exported Galaxy workflow: %s" - % (str( relative_path ), str( e ) ) ) + % ( str( relative_path ), str( e ) ) ) valid_exported_galaxy_workflow = False if valid_exported_galaxy_workflow and \ 'a_galaxy_workflow' in exported_workflow_dict and \