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