From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73B46138334 for ; Sat, 16 Nov 2019 09:23:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5A2AE0815; Sat, 16 Nov 2019 09:23:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A1D4E0815 for ; Sat, 16 Nov 2019 09:23:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54EBF34CE98 for ; Sat, 16 Nov 2019 09:23:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0A1D85C for ; Sat, 16 Nov 2019 09:23:24 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1573896146.bdb9be18b287c3c2d35e3ce577c2aeab1fcc86b7.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/Binpkg.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: bdb9be18b287c3c2d35e3ce577c2aeab1fcc86b7 X-VCS-Branch: master Date: Sat, 16 Nov 2019 09:23:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fcb5b2fb-2ecb-49a9-a859-15e7c0519e52 X-Archives-Hash: bc14d0146518c6dd05e10bbbf3dad070 commit: bdb9be18b287c3c2d35e3ce577c2aeab1fcc86b7 Author: Zac Medico gentoo org> AuthorDate: Sat Nov 16 09:21:12 2019 +0000 Commit: Zac Medico gentoo 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 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