Make iuse_implicit_re private for now.
authorZac Medico <zmedico@gentoo.org>
Tue, 27 Apr 2010 21:21:47 +0000 (14:21 -0700)
committerZac Medico <zmedico@gentoo.org>
Tue, 27 Apr 2010 21:21:47 +0000 (14:21 -0700)
pym/_emerge/depgraph.py
pym/portage/dbapi/__init__.py
pym/portage/package/ebuild/config.py

index 4214abdfc14529e0d989f2c5b0400624ae3c23c9..385d18b1d7a3fa546d2665dd73cd9d4cdaee7328 100644 (file)
@@ -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:
index f8fe8976915a19a9df3af05ea4247b4414bedc86..2467cb54ebb55696406412ddab911694e9bcda40 100644 (file)
@@ -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"])
index 239eced4a63470b6625ba131aafa6ce6548c5e3a..30035e6fdf918b0537e54d3917b8974b10672622 100644 (file)
@@ -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: