diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-05-01 10:09:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-05-01 10:09:22 +0000 |
| commit | 7bea59f8a8f70be0ffdcd4b920f43ff15a9b550b (patch) | |
| tree | 27f709e63a306389507863d59727c740885d7c41 | |
| parent | a6245839492ccd1ac182d20f261e0e1d204ce357 (diff) | |
| download | portage-7bea59f8a8f70be0ffdcd4b920f43ff15a9b550b.tar.gz portage-7bea59f8a8f70be0ffdcd4b920f43ff15a9b550b.tar.bz2 portage-7bea59f8a8f70be0ffdcd4b920f43ff15a9b550b.zip | |
Don't skip regenerate() because leads to 'Problem resolving dependencies' from emerge. Thanks to swegener for reporting.
svn path=/main/trunk/; revision=3293
| -rw-r--r-- | pym/portage.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py index 45f3f2139..43f5ff5a7 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1287,14 +1287,18 @@ class config: self["PORTDIR_OVERLAY"] = string.join(new_ov) self.backup_changes("PORTDIR_OVERLAY") - # XXX - # The below self.regenerate() causes previous changes to FEATURES (and - # other incrementals) to be reverted. If this instance is a clone, we - # need to skip regenerate() so that the copied values are preserved. if clone is None: self.regenerate() - - self.features = portage_util.unique_array(self["FEATURES"].split()) + self.features = portage_util.unique_array(self["FEATURES"].split()) + else: + # XXX + # The below self.regenerate() causes previous changes to FEATURES (and + # other incrementals) to be reverted. If this instance is a clone, we + # need to skip regenerate() so that the copied values are preserved. + self.features = portage_util.unique_array(self["FEATURES"].split()) + self.regenerate() + self["FEATURES"] = " ".join(self.features) + self.backup_changes("FEATURES") #XXX: Should this be temporary? Is it possible at all to have a default? if "gpg" in self.features: |