diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-31 09:54:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-31 09:54:35 +0000 |
| commit | e99034aa0e421d710f81f26e8c14bbe4fd0f527c (patch) | |
| tree | fb1782b722e82acc8dbda2b47db5f36a0538f47f /pym/portage.py | |
| parent | 2c6fbaeb0655ead3340fd8e6fb1d761f939b273b (diff) | |
| download | portage-e99034aa0e421d710f81f26e8c14bbe4fd0f527c.tar.gz portage-e99034aa0e421d710f81f26e8c14bbe4fd0f527c.tar.bz2 portage-e99034aa0e421d710f81f26e8c14bbe4fd0f527c.zip | |
Fix config.setcpv() to properly call config.regenerate() in cases
when USE needs to be regenerated due to FEATURES=test to USE=test
mapping. (trunk r9126)
svn path=/main/branches/2.1.2/; revision=9127
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 4df9b64b2..a90ae56f5 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1938,7 +1938,14 @@ class config: self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE if iuse != self.configdict["pkg"].get("IUSE",""): self.configdict["pkg"]["IUSE"] = iuse - if self._use_wildcards or self.get("EBUILD_PHASE"): + test_use_changed = False + if "test" in self.features: + test_use_changed = \ + ("test" in iuse.split()) != \ + ("test" in self.get("PORTAGE_USE","").split()) + if self.get("EBUILD_PHASE") or \ + self._use_wildcards or \ + test_use_changed: # Without this conditional, regenerate() would be called # *every* time. has_changed = True |