From: Gordon Hecker <gh@emlix.com>
Date: Thu, 29 Apr 2010 08:15:43 +0000 (+0200)
Subject: store result local environment in res._env instead of res.env
X-Git-Tag: e2factory-2.3.6pre1~12
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=045d47f981b849edca829e1dba08fe80d4b59d63;p=e2factory.git

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 d00266c..e33ab87 100644
--- 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 4539647..5772efd 100644
--- 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