diff options
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 481c1be37..57040b1cb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -911,6 +911,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): @@ -1153,7 +1157,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[:] |