Package: filter built USE for bug #453400

The enabled flags must be consistent with implicit IUSE, in order to
avoid potential inconsistencies in USE dep matching (see bug #453400).

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 09d8b9310484ae13923968a59a7f6bd683aeb416..eee41ebda245af256dd509cfefebf2b453652d26 100644 (file)
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -561,7 +561,7 @@ class Package(Task):
        @property
        def use(self):
                if self._use is None:
-                       self._metadata._init_use()
+                       self._init_use()
                return self._use
 
        def _get_pkgsettings(self):
@@ -570,6 +570,42 @@ class Package(Task):
                pkgsettings.setcpv(self)
                return pkgsettings
 
+       def _init_use(self):
+               if self.built:
+                       # Use IUSE to validate USE settings for built packages,
+                       # in case the package manager that built this package
+                       # failed to do that for some reason (or in case of
+                       # data corruption). The enabled flags must be consistent
+                       # with implicit IUSE, in order to avoid potential
+                       # inconsistencies in USE dep matching (see bug #453400).
+                       use_str = self._metadata['USE']
+                       is_valid_flag = self.iuse.is_valid_flag
+                       enabled_flags = [x for x in use_str.split() if is_valid_flag(x)]
+                       use_str = " ".join(enabled_flags)
+                       self._use = self._use_class(
+                               self, use_str)
+               else:
+                       try:
+                               use_str = _PackageMetadataWrapperBase.__getitem__(
+                                       self._metadata, 'USE')
+                       except KeyError:
+                               use_str = None
+                       calculated_use = False
+                       if not use_str:
+                               use_str = self._get_pkgsettings()["PORTAGE_USE"]
+                               calculated_use = True
+                       _PackageMetadataWrapperBase.__setitem__(
+                               self._metadata, 'USE', use_str)
+                       self._use = self._use_class(
+                               self, use_str)
+                       # Initialize these now, since USE access has just triggered
+                       # setcpv, and we want to cache the result of the force/mask
+                       # calculations that were done.
+                       if calculated_use:
+                               self._use._init_force_mask()
+
+               return use_str
+
        class _iuse(object):
 
                __slots__ = ("__weakref__", "_iuse_implicit_match", "_pkg", "alias_mapping",
@@ -718,31 +754,6 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase):
 
                self.update(metadata)
 
-       def _init_use(self):
-               if self._pkg.built:
-                       use_str = self['USE']
-                       self._pkg._use = self._pkg._use_class(
-                               self._pkg, use_str)
-               else:
-                       try:
-                               use_str = _PackageMetadataWrapperBase.__getitem__(self, 'USE')
-                       except KeyError:
-                               use_str = None
-                       calculated_use = False
-                       if not use_str:
-                               use_str = self._pkg._get_pkgsettings()["PORTAGE_USE"]
-                               calculated_use = True
-                       _PackageMetadataWrapperBase.__setitem__(self, 'USE', use_str)
-                       self._pkg._use = self._pkg._use_class(
-                               self._pkg, use_str)
-                       # Initialize these now, since USE access has just triggered
-                       # setcpv, and we want to cache the result of the force/mask
-                       # calculations that were done.
-                       if calculated_use:
-                               self._pkg._use._init_force_mask()
-
-               return use_str
-
        def __getitem__(self, k):
                v = _PackageMetadataWrapperBase.__getitem__(self, k)
                if k in self._use_conditional_keys:
@@ -760,7 +771,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase):
                elif k == 'USE' and not self._pkg.built:
                        if not v:
                                # This is lazy because it's expensive.
-                               v = self._init_use()
+                               v = self._pkg._init_use()
 
                return v
 

diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py
index 3540c6dc6023f537decf6c3245d694090f5d7d65..79d1e7a3d51e59b4e27c4d44a5dc21666dfba1bc 100644 (file)
--- a/pym/portage/dbapi/__init__.py
+++ b/pym/portage/dbapi/__init__.py
@@ -217,7 +217,9 @@ class dbapi(object):
                        # Use IUSE to validate USE settings for built packages,
                        # in case the package manager that built this package
                        # failed to do that for some reason (or in case of
-                       # data corruption).
+                       # data corruption). The enabled flags must be consistent
+                       # with implicit IUSE, in order to avoid potential
+                       # inconsistencies in USE dep matching (see bug #453400).
                        use = frozenset(x for x in metadata["USE"].split()
                                if x in iuse or iuse_implicit_match(x))
                        missing_enabled = frozenset(x for x in