commit: bdb9be18b287c3c2d35e3ce577c2aeab1fcc86b7
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 09:21:12 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 09:22:26 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bdb9be18
Binpkg: use aux_get for check_missing_metadata
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/_emerge/Binpkg.py | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/lib/_emerge/Binpkg.py b/lib/_emerge/Binpkg.py
index 7791ec236..e7dad32fa 100644
--- a/lib/_emerge/Binpkg.py
+++ b/lib/_emerge/Binpkg.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import functools
@@ -261,17 +261,13 @@ class Binpkg(CompositeTask):
self._writemsg_level(">>> Extracting info\n")
pkg_xpak = portage.xpak.tbz2(self._pkg_path)
- check_missing_metadata = ("CATEGORY", "PF")
- missing_metadata = set()
- for k in check_missing_metadata:
- v = pkg_xpak.getfile(_unicode_encode(k,
- encoding=_encodings['repo.content']))
- if not v:
- missing_metadata.add(k)
-
pkg_xpak.unpackinfo(infloc)
- for k in missing_metadata:
- if k == "CATEGORY":
+ check_missing_metadata = ("CATEGORY", "PF")
+ for k, v in zip(check_missing_metadata,
+ self._bintree.dbapi.aux_get(self.pkg.cpv,
check_missing_metadata)):
+ if v:
+ continue
+ elif k == "CATEGORY":
v = pkg.category
elif k == "PF":
v = pkg.pf
