diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-21 06:26:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-21 06:26:53 +0000 |
| commit | 9e083838effcc9b9efc31c2fb470c6623a0e3ec6 (patch) | |
| tree | 77b74c372d9881f27f9b9067fad929ec3398f66a | |
| parent | 314d036e1e094af83017eca6e160e23a9520ff44 (diff) | |
| download | portage-9e083838effcc9b9efc31c2fb470c6623a0e3ec6.tar.gz portage-9e083838effcc9b9efc31c2fb470c6623a0e3ec6.tar.bz2 portage-9e083838effcc9b9efc31c2fb470c6623a0e3ec6.zip | |
Fix an AttributeError for config.backupenv.
svn path=/main/branches/2.1.2/; revision=8572
| -rw-r--r-- | pym/portage.py | 10 |
1 files 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) |