@@ -205,7 +205,6 @@ def __init__(self, workflow, **kwargs):
205
205
self .workflow = workflow
206
206
self .tool = workflow .tool
207
207
self .steps = [WorkflowJobStep (s ) for s in workflow .steps ]
208
- self .id = workflow .tool ["id" ]
209
208
self .state = None # type: Dict[Text, WorkflowStateItem]
210
209
self .processStatus = None # type: Text
211
210
if "outdir" in kwargs :
@@ -216,9 +215,9 @@ def __init__(self, workflow, **kwargs):
216
215
# tmp_outdir_prefix defaults to tmp, so this is unlikely to be used
217
216
self .outdir = tempfile .mkdtemp ()
218
217
219
- self .name = uniquename (u"workflow %s" % kwargs .get ("name" , shortname (self .workflow .tool [ "id" ] )))
218
+ self .name = uniquename (u"workflow %s" % kwargs .get ("name" , shortname (self .workflow .tool . get ( "id" , "embedded" ) )))
220
219
221
- _logger .debug (u"[%s] initialized step from %s" , self .name , self .tool [ "id" ] )
220
+ _logger .debug (u"[%s] initialized from %s" , self .name , self .tool . get ( "id" , "workflow embedded in %s" % kwargs . get ( "part_of" )) )
222
221
223
222
def receive_output (self , step , outputparms , jobout , processStatus ):
224
223
# type: (WorkflowJobStep, List[Dict[Text,Text]], Dict[Text,Text], Text) -> None
0 commit comments