Skip to content

Fix missing log error #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avsm merged 1 commit into from
Jan 29, 2015
Merged

Fix missing log error #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions lib/mirage_misc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,23 +209,25 @@ let command ?(redirect=true) fmt =
Printf.kprintf (fun cmd ->
info "%s %s" (yellow_s "=>") cmd;
let redirect fn =
if redirect then
with_redirect stdout "log" (fun () ->
if redirect then (
let status =
with_redirect stdout "log" (fun () ->
with_redirect stderr "log" fn
)
else (
) in
if status <> 0 then (
let ic = open_in "log" in
try while true do error_msg !section "%s" (input_line ic) done;
with End_of_file -> ()
);
status
) else (
flush stdout;
flush stderr;
fn ()
) in
match redirect (fun () -> Sys.command cmd) with
| 0 -> ()
| i ->
let ic = open_in "log" in
begin
try while true do error_msg !section "%s" (input_line ic) done
with End_of_file -> ()
end;
error "The command %S exited with code %d." cmd i;
) fmt

Expand Down