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 24BC6158089 for ; Sun, 22 Oct 2023 19:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 421B02BC016; Sun, 22 Oct 2023 19:03:36 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 216F72BC016 for ; Sun, 22 Oct 2023 19:03:36 +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 19716335C7E 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 A725412AE 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: <1698001172.c1977b8672d3af2abc5d7034fd30f35bfad76d38.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: c1977b8672d3af2abc5d7034fd30f35bfad76d38 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: 52a86ceb-b5b5-45bd-84fe-e7c3998bfac9 X-Archives-Hash: 00c4e7b9d69c6b1260d5abd0db340064 commit: c1977b8672d3af2abc5d7034fd30f35bfad76d38 Author: Florian Schmaus gentoo org> AuthorDate: Sun Oct 22 08:58:42 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 22 18:59:32 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c1977b86 sync: git: fetch/clone with --verbose if verbose is enabled Invoking git fetch/clone with --verbose shows the URL of the remote, which is viable information. Otherwise the user may believe that they are using a different remote then they are actually using. Signed-off-by: Florian Schmaus gentoo.org> Closes: https://github.com/gentoo/portage/pull/1143 Signed-off-by: Sam James gentoo.org> lib/portage/sync/modules/git/git.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py index 1914122d9d..24389ca02a 100644 --- a/lib/portage/sync/modules/git/git.py +++ b/lib/portage/sync/modules/git/git.py @@ -139,8 +139,12 @@ class GitSync(NewBase): """ if not self.has_bin: return (1, False) + + opts = self.options.get("emerge_config").opts + git_cmd_opts = "" quiet = self.settings.get("PORTAGE_QUIET") == "1" + verbose = "--verbose" in opts # We don't want to operate with a .git outside of the given # repo in any circumstances. @@ -170,6 +174,8 @@ class GitSync(NewBase): if quiet: git_cmd_opts += " --quiet" + elif verbose: + git_cmd_opts += " --verbose" # The logic here is a bit delicate. We need to balance two things: # 1. Having a robust sync mechanism which works unattended.