summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 6205d7315..dd479aab0 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -989,6 +989,10 @@ 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):
@@ -1231,7 +1235,10 @@ 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[:]