From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Apr 2010 21:21:47 +0000 (-0700)
Subject: Make iuse_implicit_re private for now.
X-Git-Tag: v2.2_rc68~638
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=394aa7860c7e998fa491470f2cf068ca3eeccb9b;p=portage.git

Make iuse_implicit_re private for now.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 4214abdfc..385d18b1d 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2462,7 +2462,7 @@ class depgraph(object):
 					if atom.use:
 						for x in atom.use.required:
 							if x not in pkg.iuse.all and \
-								pkg.root_config.settings.iuse_implicit_re.match(x) is None:
+								pkg.root_config.settings._iuse_implicit_re.match(x) is None:
 								missing_iuse = True
 								break
 						if missing_iuse:
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py
index f8fe89769..2467cb54e 100644
--- a/pym/portage/dbapi/__init__.py
+++ b/pym/portage/dbapi/__init__.py
@@ -146,7 +146,7 @@ class dbapi(object):
 		2) Check enabled/disabled flag states.
 		"""
 
-		iuse_implicit_re = self.settings.iuse_implicit_re
+		iuse_implicit_re = self.settings._iuse_implicit_re
 		for cpv in cpv_iter:
 			try:
 				iuse, slot, use = self.aux_get(cpv, ["IUSE", "SLOT", "USE"])
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 239eced4a..30035e6fd 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -371,6 +371,7 @@ class config(object):
 			self.packages = clone.packages
 			self.useforce_list = clone.useforce_list
 			self.usemask_list = clone.usemask_list
+			self._iuse_implicit_re = clone._iuse_implicit_re
 
 			self.user_profile_dir = copy.deepcopy(clone.user_profile_dir)
 			self.local_config = copy.deepcopy(clone.local_config)
@@ -427,7 +428,6 @@ class config(object):
 			self._accept_properties = copy.deepcopy(clone._accept_properties)
 			self._ppropertiesdict = copy.deepcopy(clone._ppropertiesdict)
 
-			self.iuse_implicit_re = clone.iuse_implicit_re
 		else:
 
 			def check_var_directory(varname, var):
@@ -1013,7 +1013,7 @@ class config(object):
 				_validate_cache_for_unsupported_eapis = False
 				_glep_55_enabled = True
 
-			self.iuse_implicit_re = re.compile("^(%s)$" % \
+			self._iuse_implicit_re = re.compile("^(%s)$" % \
 				"|".join(self._get_implicit_iuse()))
 
 		for k in self._case_insensitive_vars: