matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pun a few record fields in Process 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-08-27 12:42:02 +03:00
parent 988a571c65
commit 9d61c59500
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/process.ml
View File

@ -260,7 +260,7 @@ let run_internal ?dir ?(stdout_to=Terminal) ?(stderr_to=Terminal) ~env ~purpose
close_std_output close_stdout; close_std_output close_stdout;
close_std_output close_stderr; close_std_output close_stderr;
Scheduler.wait_for_process pid Scheduler.wait_for_process pid
>>| fun status -> >>| fun exit_status ->
let output = let output =
match output_filename with match output_filename with
| None -> "" | None -> ""
@ -273,13 +273,10 @@ let run_internal ?dir ?(stdout_to=Terminal) ?(stderr_to=Terminal) ~env ~purpose
else else
s s
in in
Log.command (Scheduler.log scheduler) Log.command (Scheduler.log scheduler) ~command_line ~output ~exit_status;
~command_line:command_line
~output:output
~exit_status:status;
let _, progname, _ = Fancy.split_prog prog in let _, progname, _ = Fancy.split_prog prog in
let print fmt = Errors.kerrf ~f:(Scheduler.print scheduler) fmt in let print fmt = Errors.kerrf ~f:(Scheduler.print scheduler) fmt in
match status with match exit_status with
| WEXITED n when code_is_ok ok_codes n -> | WEXITED n when code_is_ok ok_codes n ->
if display = Verbose then begin if display = Verbose then begin
if output <> "" then if output <> "" then