From: Gordon Hecker <gh@emlix.com>
Date: Mon, 30 Mar 2009 13:34:54 +0000 (+0200)
Subject: export global variables before result local variables
X-Git-Tag: e2factory-2.3.1pre1~47
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=8f9b783e0145e35c7612fb409c164d9c5fc91e49;p=e2factory.git

export global variables before result local variables

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/local/e2build.lua b/local/e2build.lua
index 393b3eb..a602c69 100644
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -869,13 +869,18 @@ function write_environment_script(env, r, file)
 		e:append("%s: %s", file, msg)
 		return false, e
 	end
+	-- export global variables first 
+	for k,v in pairs(env) do
+		if type(v) == "string" then
+			f:write(string.format("%s=\"%s\"\n", k, v))
+		end
+	end
+	-- export result local variables
 	for k,v in pairs(env) do
 		if type(v) == "table" and r == k then
 			for k2, v2 in pairs(v) do
 				f:write(string.format("%s=\"%s\"\n", k2, v2))
 			end
-		elseif type(v) == "string" then
-			f:write(string.format("%s=\"%s\"\n", k, v))
 		end
 	end
 	f:close()