From b67906c233641667dac093b4fbb2df242a863c13 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 29 May 2013 19:28:54 +0200 Subject: [PATCH] Remove build_config.env, duplicate data Signed-off-by: Tobias Ulmer --- local/e2build.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/local/e2build.lua b/local/e2build.lua index a6c10ee..a6c0812 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -180,7 +180,6 @@ end -- @field profile Configuration file passed to the shell (string). -- @field groups table of strings: chroot groups -- @field builtin_env Environment that's built in like E2_TMPDIR. --- @field env Environment specified by the user. --- Generate build_config and store in res.build_config. -- @param info Info table. @@ -242,7 +241,6 @@ function e2build.build_config(info, r) bc.builtin_env:set("T", bc.Tc) bc.builtin_env:set("r", r) bc.builtin_env:set("R", r) - bc.env = e2tool.env_by_result(info, r) res.build_config = strict.lock(bc) @@ -695,7 +693,7 @@ local function sources(info, r, return_flags) res.build_config.Tc)) -- install project specific environment variables local file = string.format("%s/env/env", res.build_config.T) - rc, re = write_environment_script(res.build_config.env, file) + rc, re = write_environment_script(e2tool.env_by_result(info, r), file) if not rc then return false, e:cat(re) end @@ -1195,7 +1193,7 @@ local function collect_project(info, r, return_flags) local file, line -- generate environment script file = string.format("%s/env", destdir) - rc, re = write_environment_script(rn.build_config.env, file) + rc, re = write_environment_script(e2tool.env_by_result(info, n), file) if not rc then return false, e:cat(re) end -- 2.39.5