From 9e083838effcc9b9efc31c2fb470c6623a0e3ec6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 21 Nov 2007 06:26:53 +0000 Subject: [PATCH] Fix an AttributeError for config.backupenv. svn path=/main/branches/2.1.2/; revision=8572 --- pym/portage.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 6189bfe89..8081737f1 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1071,11 +1071,6 @@ class config: self._use_wildcards = copy.deepcopy(clone._use_wildcards) else: - 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): writemsg(("!!! Error: %s='%s' is not a directory. " + \ @@ -1333,6 +1328,11 @@ class config: self.configlist.append(self.backupenv) # XXX Why though? self.configdict["backupenv"]=self.configlist[-1] + if not local_config: + # Clean up pollution from portage_data so that it doesn't + # interfere with repoman. + self.backupenv.pop("USERLAND", None) + # Don't allow the user to override certain variables in the env for k in profile_only_variables: self.backupenv.pop(k, None) -- 2.26.2