[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/, lib/portage/tests/update/

[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/, lib/portage/tests/update/

[Sam James]

commit:     c00dbfb9d8e3c494173200436ec4c5bc2689707f
Author:     Sheng Yu <syu.os <AT> protonmail <DOT> com>
AuthorDate: Fri Feb 10 07:55:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <syu.os <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> 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"',
+                        ),
                     },
                 )