diff options
| author |   Sam James <sam@gentoo.org> | 2023-08-19 16:38:22 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-19 16:38:56 +0100 |
| commit | b7abeab6041247a0b5f9d750fb5c85e6f573f90c (patch) | |
| tree | 33c359c6a54ef8b825efc922c0dab7dd902a997b | |
| parent | misc/emerge-delta-webrsync: fix incorrect warning in --help (diff) | |
| download | portage-b7abeab6.tar.gz portage-b7abeab6.tar.bz2 portage-b7abeab6.zip | |
sync: git: don't log on OK signature with --quiet
No point in emitting a message if everything is fine when the user asks
for --quiet.
Bug: https://bugs.gentoo.org/673624
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/portage/sync/modules/git/git.py | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -11,6 +11,8 @@ Bug fixes: * sync (inc. emerge-webrsync): Handle https_proxy to help users who only have it set - the expectation is to have http_proxy set (bug #691434, bug #835927, bug #911629) +* sync: git: respect --quiet more for PGP verification (bug #673624). + * emerge-webrsync: Explicitly pass http_proxy or https_proxy into gemato via --proxy (bug #911629). diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py index b73b07e32..ead276a98 100644 --- a/lib/portage/sync/modules/git/git.py +++ b/lib/portage/sync/modules/git/git.py @@ -418,6 +418,7 @@ class GitSync(NewBase): opts = self.options.get("emerge_config").opts debug = "--debug" in opts + quiet = self.settings.get("PORTAGE_QUIET") == "1" openpgp_env = self._get_openpgp_env(self.repo.sync_openpgp_key_path, debug) @@ -459,7 +460,8 @@ class GitSync(NewBase): return False if status == "G": # good signature is good - out.einfo("Trusted signature found on top commit") + if not quiet: + out.einfo("Trusted signature found on top commit") return True if status == "U": # untrusted out.ewarn("Top commit signature is valid but not trusted") |