From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 12 Jan 2021 16:47:02 +0000 (+0000)
Subject: builder: Move shell environment variables into submodule
X-Git-Tag: 0.9.28~1285^2~888
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=338906ee1df10a26d13280f9952cb589aa340f5e;p=pakfire.git

builder: Move shell environment variables into submodule

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/builder.py b/src/pakfire/builder.py
index ad77d5769..1d6689305 100644
--- a/src/pakfire/builder.py
+++ b/src/pakfire/builder.py
@@ -433,15 +433,14 @@ class BuilderContext(object):
 
 	@property
 	def environ(self):
-		env = MINIMAL_ENVIRONMENT.copy()
-		env.update({
-			# Add HOME manually, because it is occasionally not set
-			# and some builds get in trouble then.
+		# Build a minimal environment for executing, but try to inherit TERM and LANG
+		env = {
+			"HOME" : "/root",
+			"PATH" : "/usr/bin:/bin:/usr/sbin:/sbin",
+			"PS1"  : "\\u:\w\$ ",
 			"TERM" : os.environ.get("TERM", "vt100"),
-
-			# Sanitize language.
-			"LANG" : os.environ.setdefault("LANG", "en_US.UTF-8"),
-		})
+			"LANG" : os.environ.get("LANG", "en_US.UTF-8"),
+		}
 
 		# Inherit environment from distro
 		env.update(self.pakfire.distro.environ)
diff --git a/src/pakfire/constants.py b/src/pakfire/constants.py
index c9d22ce66..dd83e518f 100644
--- a/src/pakfire/constants.py
+++ b/src/pakfire/constants.py
@@ -85,14 +85,6 @@ SHELL_SCRIPT = "/usr/lib/pakfire/chroot-shell"
 SHELL_PACKAGES = ["elinks", "less", "vim", SHELL_SCRIPT,]
 BUILD_ROOT = "/var/lib/pakfire/build"
 
-MINIMAL_ENVIRONMENT = {
-	"HOME" : "/root",
-	"LANG" : "C",
-	"PATH" : "/usr/bin:/bin:/usr/sbin:/sbin",
-	"PS1"  : "\\u:\w\$ ",
-	"TERM" : "vt100",
-}
-
 SOURCE_CACHE_DIR = os.path.join(CACHE_DIR, "sources")
 
 TIME_10M = 10