| 1 |
commit: bdb9be18b287c3c2d35e3ce577c2aeab1fcc86b7 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 16 09:21:12 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 16 09:22:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bdb9be18 |
| 7 |
|
| 8 |
Binpkg: use aux_get for check_missing_metadata |
| 9 |
|
| 10 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 11 |
|
| 12 |
lib/_emerge/Binpkg.py | 18 +++++++----------- |
| 13 |
1 file changed, 7 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/lib/_emerge/Binpkg.py b/lib/_emerge/Binpkg.py |
| 16 |
index 7791ec236..e7dad32fa 100644 |
| 17 |
--- a/lib/_emerge/Binpkg.py |
| 18 |
+++ b/lib/_emerge/Binpkg.py |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2018 Gentoo Foundation |
| 21 |
+# Copyright 1999-2019 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
import functools |
| 25 |
@@ -261,17 +261,13 @@ class Binpkg(CompositeTask): |
| 26 |
self._writemsg_level(">>> Extracting info\n") |
| 27 |
|
| 28 |
pkg_xpak = portage.xpak.tbz2(self._pkg_path) |
| 29 |
- check_missing_metadata = ("CATEGORY", "PF") |
| 30 |
- missing_metadata = set() |
| 31 |
- for k in check_missing_metadata: |
| 32 |
- v = pkg_xpak.getfile(_unicode_encode(k, |
| 33 |
- encoding=_encodings['repo.content'])) |
| 34 |
- if not v: |
| 35 |
- missing_metadata.add(k) |
| 36 |
- |
| 37 |
pkg_xpak.unpackinfo(infloc) |
| 38 |
- for k in missing_metadata: |
| 39 |
- if k == "CATEGORY": |
| 40 |
+ check_missing_metadata = ("CATEGORY", "PF") |
| 41 |
+ for k, v in zip(check_missing_metadata, |
| 42 |
+ self._bintree.dbapi.aux_get(self.pkg.cpv, check_missing_metadata)): |
| 43 |
+ if v: |
| 44 |
+ continue |
| 45 |
+ elif k == "CATEGORY": |
| 46 |
v = pkg.category |
| 47 |
elif k == "PF": |
| 48 |
v = pkg.pf |
Archives