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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 588FE15800F for ; Fri, 17 Feb 2023 01:23:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 399EAE0849; Fri, 17 Feb 2023 01:23:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D8DFE0849 for ; Fri, 17 Feb 2023 01:23:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18ED734114B for ; Fri, 17 Feb 2023 01:23:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7AFC8AB for ; Fri, 17 Feb 2023 01:23:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1676596994.c00dbfb9d8e3c494173200436ec4c5bc2689707f.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/, lib/portage/tests/update/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/dbapi/bintree.py lib/portage/tests/update/test_move_ent.py X-VCS-Directories: lib/portage/tests/update/ lib/portage/dbapi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c00dbfb9d8e3c494173200436ec4c5bc2689707f X-VCS-Branch: master Date: Fri, 17 Feb 2023 01:23:25 +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: 2da3f15f-9c1e-476c-b675-7d1bfd917983 X-Archives-Hash: 6584b74721108832ae997e98f7b8a060 commit: c00dbfb9d8e3c494173200436ec4c5bc2689707f Author: Sheng Yu protonmail com> AuthorDate: Fri Feb 10 07:55:26 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 17 01:23:14 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c00dbfb9 Ignore update GPG signed binpkg User cannot update them without key. Signed-off-by: Sheng Yu protonmail.com> Signed-off-by: Sam James gentoo.org> lib/portage/dbapi/bintree.py | 8 ++++++++ lib/portage/tests/update/test_move_ent.py | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py index 23bc41d44..5f58c548d 100644 --- a/lib/portage/dbapi/bintree.py +++ b/lib/portage/dbapi/bintree.py @@ -674,6 +674,14 @@ class binarytree: elif binpkg_format == "gpkg": mybinpkg = portage.gpkg.gpkg(self.settings, mycpv, binpkg_path) mydata = mybinpkg.get_metadata() + if mybinpkg.signature_exist: + writemsg( + colorize( + "WARN", + f"Binpkg update ignored for signed package: {binpkg_path}", + ) + ) + continue decode_metadata_name = True else: continue diff --git a/lib/portage/tests/update/test_move_ent.py b/lib/portage/tests/update/test_move_ent.py index 562d7b107..22d0c8feb 100644 --- a/lib/portage/tests/update/test_move_ent.py +++ b/lib/portage/tests/update/test_move_ent.py @@ -58,7 +58,10 @@ class MoveEntTestCase(TestCase): ebuilds=ebuilds, installed=installed, user_config={ - "make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',), + "make.conf": ( + f'BINPKG_FORMAT="{binpkg_format}"', + 'FEATURES="-binpkg-signing"', + ), }, )