[patch] config: default features USE for conditional RESTRICT

0001-config-default-features-USE-for-conditional-RESTRICT.patch (text/plain), 2.20 KB, created by Zac Medico on 2018-08-17 17:31:10 UTC

From cf103b3f0ebed977101491fb24d5e3bd11d6df89 Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Fri, 17 Aug 2018 04:08:21 -0700
Subject: [PATCH] config: default features USE for conditional RESTRICT (bug
 663848)

Fixes: 45986341a80c ("Support !test? conditionals in RESTRICT (bug 663278)")
---
 lib/portage/package/ebuild/config.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 3b01095d0..7e87f9014 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._default_features_use = clone._default_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,14 @@ class config(object):
 
 			# initialize self.features
 			self.regenerate()
+			features_use = []
+			if "test" in self.features:
+				features_use.append("test")
+			self.configdict["features"]["USE"] = self._default_features_use = " ".join(features_use)
+			if features_use:
+				# Regenerate USE to have the correct value for the first
+				# conditional RESTRICT evaluation in setcpv.
+				self.regenerate()
 
 			if unprivileged:
 				self.features.add('unprivileged')
@@ -1296,7 +1305,7 @@ class config(object):
 			del self._penv[:]
 			self.configdict["pkg"].clear()
 			self.configdict["pkginternal"].clear()
-			self.configdict["features"].clear()
+			self.configdict["features"] = {"USE": self._default_features_use}
 			self.configdict["repo"].clear()
 			self.configdict["defaults"]["USE"] = \
 				" ".join(self.make_defaults_use)
@@ -1598,7 +1607,7 @@ class config(object):
 			has_changed = True
 			# Prevent stale features USE from corrupting the evaluation
 			# of USE conditional RESTRICT.
-			self.configdict["features"]["USE"] = ""
+			self.configdict["features"] = {"USE": self._default_features_use}
 
 		self._penv = []
 		cpdict = self._penvdict.get(cp)
-- 
2.16.4