From 6c193ece694dc93eb6948f40a135457c9c85d0d6 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 5 Apr 2007 21:20:57 +0000
Subject: Don't set os.environ["USERLAND"] inside portage.data and rely on
 USERLAND from the profile instead (bail out if necessary when USERLAND is
 unset).

svn path=/main/trunk/; revision=6341
---
 bin/etc-update          | 2 +-
 pym/emerge/__init__.py  | 6 ++++--
 pym/portage/__init__.py | 8 --------
 pym/portage/data.py     | 2 --
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/bin/etc-update b/bin/etc-update
index ab376b83c..bf1d0139b 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -386,7 +386,7 @@ Please select from the menu above (-1 to exit, losing this merge): "
 			my_input=$(read_int)
 			case ${my_input} in
 				1) echo "Replacing ${ofile} with ${mfile}"
-				   if [[ ${USERLAND} == GNU ]]; then
+				   if [[ ${USERLAND:-GNU} == GNU ]]; then
 				       chmod --reference="${ofile}" "${mfile}"
 				   else
 				       chmod $(stat -f %Mp%Lp "${ofile}") "${mfile}"
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 980eff386..313098ca9 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -5145,8 +5145,10 @@ def parse_opts(tmpcmdline, silent=False):
 def validate_ebuild_environment(trees):
 	for myroot in trees:
 		mysettings = trees[myroot]["vartree"].settings
-		if not mysettings.get("ARCH", None):
-			print >> sys.stderr, bad("\a!!! ARCH is not set... " + \
+		for var in "ARCH", "USERLAND":
+			if mysettings.get(var):
+				continue
+			print >> sys.stderr, bad(("\a!!! %s is not set... " % var) + \
 				"Are you missing the '%setc/make.profile' symlink?" % \
 				mysettings["PORTAGE_CONFIGROOT"])
 			print >> sys.stderr, bad("\a!!! Is the symlink correct? " + \
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2b954254a..3e09e9992 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -914,10 +914,6 @@ class config:
 
 			# backupenv is for calculated incremental variables.
 			self.backupenv = os.environ.copy()
-			if not local_config:
-				# Clean up pollution from portage.data so that it doesn't
-				# interfere with repoman.
-				self.backupenv.pop("USERLAND", None)
 
 			def check_var_directory(varname, var):
 				if not os.path.isdir(var):
@@ -1160,10 +1156,6 @@ class config:
 
 			self.configlist.append(os.environ.copy())
 			self.configdict["env"]=self.configlist[-1]
-			if not local_config:
-				# Clean up pollution from portage.data so that it doesn't
-				# interfere with repoman.
-				self.configdict["env"].pop("USERLAND", None)
 
 			# make lookuplist for loading package.*
 			self.lookuplist=self.configlist[:]
diff --git a/pym/portage/data.py b/pym/portage/data.py
index 3caef1b2c..fbd419b28 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -44,8 +44,6 @@ if not lchown:
 					" exist.  Please rebuild python.\n", noiselevel=-1)
 			lchown()
 
-os.environ["USERLAND"]=userland
-
 def portage_group_warning():
 	warn_prefix = bad("*** WARNING ***  ")
 	mylines = [
-- 
cgit v1.2.3-1-g7c22