From: Zac Medico Date: Sat, 24 Feb 2007 12:43:04 +0000 (-0000) Subject: Clean up os.environ["USERLAND"] pollution from the portage.data module so that it... X-Git-Tag: v2.2_pre1~1646 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cacc8846414beadaccc8f14f70130ad2deb249b;p=portage.git Clean up os.environ["USERLAND"] pollution from the portage.data module so that it doesn't interfere with repoman. svn path=/main/trunk/; revision=6068 --- 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[:]