[gentoo-commits] proj/gentoopm:master commit in: gentoopm/basepm/, gentoopm/pkgcorepm/

[Michał Górny]

commit:     0468a6b87ed5469c0753168137db5811458f30e4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 10:10:47 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 10:10:47 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gentoopm.git/commit/?id=0468a6b8

Minor refactoring of USE_EXPAND code

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 gentoopm/basepm/repo.py    | 2 +-
 gentoopm/pkgcorepm/repo.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gentoopm/basepm/repo.py b/gentoopm/basepm/repo.py
index ccc6dc5..fe3ee38 100644
--- a/gentoopm/basepm/repo.py
+++ b/gentoopm/basepm/repo.py
@@ -85,7 +85,7 @@ class GlobalUseFlag(typing.NamedTuple):
     """Global USE flag (as defined by use.desc)"""
 
     name: str
-    description: typing.Optional[str]
+    description: typing.Optional[str] = None
 
 
 class UseExpand(typing.NamedTuple):

diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py
index 257c4bc..6558e14 100644
--- a/gentoopm/pkgcorepm/repo.py
+++ b/gentoopm/pkgcorepm/repo.py
@@ -141,7 +141,11 @@ class PkgCoreEbuildRepo(PkgCoreRepository, 
PMEbuildRepository, FillMissingCompar
             hidden = self._domain.profile.use_expand_hidden
 
             for k in itertools.chain(prefixed, unprefixed):
-                values = {}
+                values = {
+                    flag: GlobalUseFlag(flag)
+                    for flag in self._domain.profile.default_env.get(
+                        "USE_EXPAND_VALUES_" + k, "").split()
+                }
                 for flag in (self._domain.profile.default_env
                              .get("USE_EXPAND_VALUES_" + k, "").split()):
                     values[flag] = GlobalUseFlag(flag, None)