From 07385a15ed0e312d037c95ae5993e7bfe40cb067 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 16 Mar 2018 01:45:52 +0800 Subject: [PATCH] Remove double extending the env with context's env --- src/action.ml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/action.ml b/src/action.ml index 30781a6b..f91ac157 100644 --- a/src/action.ml +++ b/src/action.ml @@ -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) ->