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

Remove double extending the env with context's env

This commit is contained in:
Rudi Grinberg 2018-03-16 01:45:52 +08:00
parent 68cf393c5f
commit 07385a15ed
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/action.ml
View File

@ -735,16 +735,7 @@ let rec exec t ~ectx ~dir ~env ~stdout_to ~stderr_to =
| Run (Error e, _) ->
Prog.Not_found.raise e
| Run (Ok prog, args) ->
exec_run ~ectx ~dir ~env:(
match ectx.context with
| None ->
Sexp.code_error "context isn't available to this run action"
[ "action", sexp_of_t t
; "dir", Path.sexp_of_t dir
; "env", Env.sexp_of_t env ]
| Some ctx ->
Env.extend_env ctx.env env
) ~stdout_to ~stderr_to prog args
exec_run ~ectx ~dir ~env ~stdout_to ~stderr_to prog args
| Chdir (dir, t) ->
exec t ~ectx ~dir ~env ~stdout_to ~stderr_to
| Setenv (var, value, t) ->