Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 3/4] Remove UNUSED* auxdbkeys
Date: Fri, 03 Sep 2021 16:35:48
Message-Id: 20210903163532.2465253-4-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 0/4] Modernize metadata passing & add INHERIT to md5-cache by "Michał Górny"
1 The UNUSED* auxdbkeys are a relict of old metadata cache format that
2 required a fixed number of lines. This format is no longer supported
3 by Portage, and all uses of auxdbkeys strip UNUSED values, so just
4 remove them entirely.
5
6 Signed-off-by: Michał Górny <mgorny@g.o>
7 ---
8 bin/portageq | 3 +--
9 lib/_emerge/Package.py | 3 +--
10 lib/portage/__init__.py | 4 +---
11 lib/portage/dbapi/__init__.py | 3 +--
12 repoman/lib/repoman/qa_data.py | 2 +-
13 5 files changed, 5 insertions(+), 10 deletions(-)
14
15 diff --git a/bin/portageq b/bin/portageq
16 index 385259f9d..d3cb9f140 100755
17 --- a/bin/portageq
18 +++ b/bin/portageq
19 @@ -238,8 +238,7 @@ docstrings['metadata'] = """
20 <eroot> <pkgtype> <category/package> [<key>]+
21 Returns metadata values for the specified package.
22 Available keys: %s
23 -""" % ','.join(sorted(x for x in portage.auxdbkeys \
24 -if not x.startswith('UNUSED_')))
25 +""" % ','.join(sorted(x for x in portage.auxdbkeys))
26 metadata.__doc__ = docstrings['metadata']
27
28
29 diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py
30 index e8809a89d..4e25619ae 100644
31 --- a/lib/_emerge/Package.py
32 +++ b/lib/_emerge/Package.py
33 @@ -791,8 +791,7 @@ class Package(Task):
34 pkg = self
35 return pkg
36
37 -_all_metadata_keys = set(x for x in portage.auxdbkeys \
38 - if not x.startswith("UNUSED_"))
39 +_all_metadata_keys = set(x for x in portage.auxdbkeys)
40 _all_metadata_keys.update(Package.metadata_keys)
41 _all_metadata_keys = frozenset(_all_metadata_keys)
42
43 diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
44 index 6e22a174b..232d77f0e 100644
45 --- a/lib/portage/__init__.py
46 +++ b/lib/portage/__init__.py
47 @@ -519,10 +519,8 @@ auxdbkeys = (
48 'RESTRICT', 'HOMEPAGE', 'LICENSE', 'DESCRIPTION',
49 'KEYWORDS', 'INHERITED', 'IUSE', 'REQUIRED_USE',
50 'PDEPEND', 'BDEPEND', 'EAPI',
51 - 'PROPERTIES', 'DEFINED_PHASES', 'IDEPEND', 'UNUSED_04',
52 - 'UNUSED_03', 'UNUSED_02', 'UNUSED_01',
53 + 'PROPERTIES', 'DEFINED_PHASES', 'IDEPEND',
54 )
55 -auxdbkeylen = len(auxdbkeys)
56
57 def portageexit():
58 pass
59 diff --git a/lib/portage/dbapi/__init__.py b/lib/portage/dbapi/__init__.py
60 index d7facc9b6..3caefb816 100644
61 --- a/lib/portage/dbapi/__init__.py
62 +++ b/lib/portage/dbapi/__init__.py
63 @@ -28,8 +28,7 @@ class dbapi:
64 _category_re = re.compile(r'^\w[-.+\w]*$', re.UNICODE)
65 _categories = None
66 _use_mutable = False
67 - _known_keys = frozenset(x for x in auxdbkeys
68 - if not x.startswith("UNUSED_0"))
69 + _known_keys = frozenset(auxdbkeys)
70 _pkg_str_aux_keys = ("EAPI", "KEYWORDS", "SLOT", "repository")
71
72 def __init__(self):
73 diff --git a/repoman/lib/repoman/qa_data.py b/repoman/lib/repoman/qa_data.py
74 index afb403d8d..4785581e2 100644
75 --- a/repoman/lib/repoman/qa_data.py
76 +++ b/repoman/lib/repoman/qa_data.py
77 @@ -79,7 +79,7 @@ class QAData:
78
79 self.missingvars = qadata.get("missingvars", [])
80 logging.debug("QAData: missingvars: %s", self.missingvars)
81 - self.allvars = set(x for x in portage.auxdbkeys if not x.startswith("UNUSED_"))
82 + self.allvars = set(portage.auxdbkeys)
83 self.allvars.update(Package.metadata_keys)
84 self.allvars = sorted(self.allvars)
85
86 --
87 2.33.0