store result local environment in res._env instead of res.env

Signed-off-by: Gordon Hecker <ghecker@gmx.de>

diff --git a/local/e2build.lua b/local/e2build.lua
index d00266ccb20159a2194e39ed3ed66ac97c444e90..e33ab872d2c739dbdcb794c59aef07fd01c6a825 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -197,9 +197,7 @@ function build_config(info, r)
   tab.builtin_env:set("T", res.build_config.Tc)
   tab.builtin_env:set("r", r)
   tab.builtin_env:set("R", r)
-  tab.env = environment.new()
-  tab.env:merge(info.global_env)
-  tab.env:merge(res.env, true)
+  tab.env = e2tool.env_by_result(info, r)
   e2lib.logf(4, "build config for result %s: ", r)
   for k,v in pairs(tab) do
      v = tostring(v)

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 4539647fc3b9c73899938294cc6decfd41445807..5772efd5e1f0b681f613d8e795aef8d1704f8b51 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -640,7 +640,7 @@ The newest configuration syntax supported by the tools is %s.
     if not info.result_env[r] then
       info.result_env[r] = environment.new()
     end
-    res.env = info.result_env[r]
+    res._env = info.result_env[r]
   end
 
   -- check for environment for non-existent results
@@ -1657,7 +1657,7 @@ function env_by_result(info, resultname)
        local res = info.results[resultname]
        local env = environment.new()
        env:merge(info.global_env, false)
-       env:merge(res.env, true)
+       env:merge(res._env, true)
        return env
 end