Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
Carl Eberhard
2015-04-02 11:42:03 -04:00
+2 -2
View File
@@ -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 \