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 BE74E158089 for ; Sun, 22 Oct 2023 19:03:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCB842BC015; Sun, 22 Oct 2023 19:03:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C66D52BC015 for ; Sun, 22 Oct 2023 19:03:35 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16E7D335C7A for ; Sun, 22 Oct 2023 19:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AAFD10C3 for ; Sun, 22 Oct 2023 19:03:33 +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: <1698001118.c46fd4e6669ed49593abe4a4b3d16cbf6fc8814e.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/git/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/sync/modules/git/git.py X-VCS-Directories: lib/portage/sync/modules/git/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c46fd4e6669ed49593abe4a4b3d16cbf6fc8814e X-VCS-Branch: master Date: Sun, 22 Oct 2023 19:03:33 +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: 1c75ede7-64ee-4453-9485-7959e9db7cbd X-Archives-Hash: 7dfa2b428bc4b9788ac31887e7d80d42 commit: c46fd4e6669ed49593abe4a4b3d16cbf6fc8814e Author: Jernej Jakob gmail com> AuthorDate: Sat Oct 21 22:35:26 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 22 18:58:38 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c46fd4e6 sync: git: Fix error with repositories with git config "log.showSignature" enabled For example, emaint sync will show "No valid signature found: unknown issue". This can be because the user has set "log.showSignature" in their git config, which produces output that portage doesn't expect. To prevent this, explicitly disable "log.showSignature" when calling git. Signed-off-by: Jernej Jakob gmail.com> Closes: https://github.com/gentoo/portage/pull/1140 Signed-off-by: Sam James gentoo.org> lib/portage/sync/modules/git/git.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py index ead276a98d..4b11e3fa85 100644 --- a/lib/portage/sync/modules/git/git.py +++ b/lib/portage/sync/modules/git/git.py @@ -447,7 +447,15 @@ class GitSync(NewBase): env = os.environ.copy() env["GNUPGHOME"] = openpgp_env.home - rev_cmd = [self.bin_command, "log", "-n1", "--pretty=format:%G?", revision] + rev_cmd = [ + self.bin_command, + "-c", + "log.showsignature=0", + "log", + "-n1", + "--pretty=format:%G?", + revision, + ] try: status = portage._unicode_decode( subprocess.check_output(