Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 663848 | Differences between
and this patch

Collapse All | Expand All

(-)a/lib/portage/package/ebuild/config.py (-3 / +11 lines)
Lines 259-264 class config(object): Link Here
259
			self.packages = clone.packages
259
			self.packages = clone.packages
260
			self.repositories = clone.repositories
260
			self.repositories = clone.repositories
261
			self.unpack_dependencies = clone.unpack_dependencies
261
			self.unpack_dependencies = clone.unpack_dependencies
262
			self._default_features_use = clone._default_features_use
262
			self._iuse_effective = clone._iuse_effective
263
			self._iuse_effective = clone._iuse_effective
263
			self._iuse_implicit_match = clone._iuse_implicit_match
264
			self._iuse_implicit_match = clone._iuse_implicit_match
264
			self._non_user_variables = clone._non_user_variables
265
			self._non_user_variables = clone._non_user_variables
Lines 961-966 class config(object): Link Here
961
962
962
			# initialize self.features
963
			# initialize self.features
963
			self.regenerate()
964
			self.regenerate()
965
			features_use = []
966
			if "test" in self.features:
967
				features_use.append("test")
968
			self.configdict["features"]["USE"] = self._default_features_use = " ".join(features_use)
969
			if features_use:
970
				# Regenerate USE to have the correct value for the first
971
				# conditional RESTRICT evaluation in setcpv.
972
				self.regenerate()
964
973
965
			if unprivileged:
974
			if unprivileged:
966
				self.features.add('unprivileged')
975
				self.features.add('unprivileged')
Lines 1296-1302 class config(object): Link Here
1296
			del self._penv[:]
1305
			del self._penv[:]
1297
			self.configdict["pkg"].clear()
1306
			self.configdict["pkg"].clear()
1298
			self.configdict["pkginternal"].clear()
1307
			self.configdict["pkginternal"].clear()
1299
			self.configdict["features"].clear()
1308
			self.configdict["features"] = {"USE": self._default_features_use}
1300
			self.configdict["repo"].clear()
1309
			self.configdict["repo"].clear()
1301
			self.configdict["defaults"]["USE"] = \
1310
			self.configdict["defaults"]["USE"] = \
1302
				" ".join(self.make_defaults_use)
1311
				" ".join(self.make_defaults_use)
Lines 1598-1604 class config(object): Link Here
1598
			has_changed = True
1607
			has_changed = True
1599
			# Prevent stale features USE from corrupting the evaluation
1608
			# Prevent stale features USE from corrupting the evaluation
1600
			# of USE conditional RESTRICT.
1609
			# of USE conditional RESTRICT.
1601
			self.configdict["features"]["USE"] = ""
1610
			self.configdict["features"] = {"USE": self._default_features_use}
1602
1611
1603
		self._penv = []
1612
		self._penv = []
1604
		cpdict = self._penvdict.get(cp)
1613
		cpdict = self._penvdict.get(cp)
1605
- 

Return to bug 663848