[patch] config.regenerate: reset features USE

0001-config.regenerate-reset-features-USE-bug-663848.patch (text/plain), 1.80 KB, created by Zac Medico on 2018-08-17 11:30:31 UTC

From fe491787c403fc1bbbe052e7f28b2867789d5cea Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Fri, 17 Aug 2018 04:08:21 -0700
Subject: [PATCH] config.regenerate: reset features USE (bug 663848)

---
 lib/portage/package/ebuild/config.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 3b01095d0..b452be885 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -259,6 +259,7 @@ class config(object):
 			self.packages = clone.packages
 			self.repositories = clone.repositories
 			self.unpack_dependencies = clone.unpack_dependencies
+			self._global_features_use = clone._global_features_use
 			self._iuse_effective = clone._iuse_effective
 			self._iuse_implicit_match = clone._iuse_implicit_match
 			self._non_user_variables = clone._non_user_variables
@@ -961,6 +962,10 @@ class config(object):
 
 			# initialize self.features
 			self.regenerate()
+			features_use = []
+			if "test" in self.features:
+				features_use.append("test")
+			self.configdict["features"]["USE"] = self._global_features_use = " ".join(features_use)
 
 			if unprivileged:
 				self.features.add('unprivileged')
@@ -1287,6 +1292,7 @@ class config(object):
 		self.modifying()
 		self.configdict["env"].clear()
 		self.configdict["env"].update(self.backupenv)
+		self.configdict["features"] = {"USE": self._global_features_use}
 
 		self.modifiedkeys = []
 		if not keeping_pkg:
@@ -1296,7 +1302,6 @@ class config(object):
 			del self._penv[:]
 			self.configdict["pkg"].clear()
 			self.configdict["pkginternal"].clear()
-			self.configdict["features"].clear()
 			self.configdict["repo"].clear()
 			self.configdict["defaults"]["USE"] = \
 				" ".join(self.make_defaults_use)
-- 
2.16.4