@@ -218,7 +218,7 @@ impl Cmds {
218
218
. map_err ( |e| new_cmd_io_error ( & e, & full_cmds, & file, line) ) ?;
219
219
}
220
220
let child = cmd
221
- . spawn ( current_dir, with_output)
221
+ . spawn ( full_cmds . clone ( ) , current_dir, with_output)
222
222
. map_err ( |e| new_cmd_io_error ( & e, & full_cmds, & file, line) ) ?;
223
223
children. push ( child) ;
224
224
}
@@ -392,20 +392,24 @@ impl Cmd {
392
392
( self . args . len ( ) > args. len ( ) , self )
393
393
}
394
394
395
- fn spawn ( mut self , current_dir : & mut PathBuf , with_output : bool ) -> Result < CmdChild > {
395
+ fn spawn (
396
+ mut self ,
397
+ full_cmds : String ,
398
+ current_dir : & mut PathBuf ,
399
+ with_output : bool ,
400
+ ) -> Result < CmdChild > {
396
401
let arg0 = self . arg0 ( ) ;
397
402
if arg0 == CD_CMD {
398
403
self . run_cd_cmd ( current_dir, & self . file , self . line ) ?;
399
404
Ok ( CmdChild :: new (
400
405
CmdChildHandle :: SyncFn ,
401
- self . cmd_str ( ) ,
406
+ full_cmds ,
402
407
self . file ,
403
408
self . line ,
404
409
self . stdout_logging ,
405
410
self . stderr_logging ,
406
411
) )
407
412
} else if self . in_cmd_map {
408
- let cmd_str = self . cmd_str ( ) ;
409
413
let pipe_out = self . stdout_logging . is_none ( ) ;
410
414
let mut env = CmdEnv {
411
415
args : self
@@ -442,7 +446,7 @@ impl Cmd {
442
446
let handle = thread:: Builder :: new ( ) . spawn ( move || internal_cmd ( & mut env) ) ?;
443
447
Ok ( CmdChild :: new (
444
448
CmdChildHandle :: Thread ( handle) ,
445
- cmd_str ,
449
+ full_cmds ,
446
450
self . file ,
447
451
self . line ,
448
452
self . stdout_logging ,
@@ -452,7 +456,7 @@ impl Cmd {
452
456
internal_cmd ( & mut env) ?;
453
457
Ok ( CmdChild :: new (
454
458
CmdChildHandle :: SyncFn ,
455
- cmd_str ,
459
+ full_cmds ,
456
460
self . file ,
457
461
self . line ,
458
462
self . stdout_logging ,
@@ -486,7 +490,7 @@ impl Cmd {
486
490
let child = cmd. spawn ( ) ?;
487
491
Ok ( CmdChild :: new (
488
492
CmdChildHandle :: Proc ( child) ,
489
- self . cmd_str ( ) ,
493
+ full_cmds ,
490
494
self . file ,
491
495
self . line ,
492
496
self . stdout_logging ,
0 commit comments