From a6245839492ccd1ac182d20f261e0e1d204ce357 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 1 May 2006 07:29:28 +0000 Subject: Make sure that emerge really removes noauto from FEATURES for bug #131820. svn path=/main/trunk/; revision=3292 --- pym/portage.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pym/portage.py') diff --git a/pym/portage.py b/pym/portage.py index 972303f1f..45f3f2139 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1287,7 +1287,12 @@ class config: self["PORTDIR_OVERLAY"] = string.join(new_ov) self.backup_changes("PORTDIR_OVERLAY") - self.regenerate() + # 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()) -- cgit v1.2.3-1-g7c22