commit: 35ca4ac2f8f0de61289bf812681c21d14d2524db Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu May 3 06:26:19 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu May 3 06:35:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=35ca4ac2
rsync: silence signature info for --quiet mode (bug 654664) Silence messages like the following for --quiet mode: * Using keys from /var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg * Refreshing keys from keyserver ... [ ok ] * Manifest timestamp: 2018-05-03 05:38:39 UTC * Valid OpenPGP signature found: * - primary key: DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D * - subkey: E1D6ABB63BFCFB4BA02FDF1CEC590EEAC9189250 * - timestamp: 2018-05-03 05:38:39 UTC * Verifying /usr/portage ... [ ok ] Bug: https://bugs.gentoo.org/654664 pym/portage/sync/modules/rsync/rsync.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py index b2850715e..1b8941ff6 100644 --- a/pym/portage/sync/modules/rsync/rsync.py +++ b/pym/portage/sync/modules/rsync/rsync.py @@ -66,7 +66,8 @@ class RsyncSync(NewBase): opts = self.options.get('emerge_config').opts self.usersync_uid = self.options.get('usersync_uid', None) enter_invalid = '--ask-enter-invalid' in opts - out = portage.output.EOutput() + quiet = '--quiet' in opts + out = portage.output.EOutput(quiet=quiet) syncuri = self.repo.sync_uri if self.repo.module_specific_options.get( 'sync-rsync-vcs-ignore', 'false').lower() == 'true': @@ -385,10 +386,12 @@ class RsyncSync(NewBase): raise RuntimeError('Timestamp not found in Manifest') if (self.max_age != 0 and (datetime.datetime.utcnow() - ts.ts).days > self.max_age): + out.quiet = False out.ewarn('Manifest is over %d days old, this is suspicious!' % (self.max_age,)) out.ewarn('You may want to try using another mirror and/or reporting this one:') out.ewarn(' %s' % (dosyncuri,)) out.ewarn('') + out.quiet = quiet out.einfo('Manifest timestamp: %s UTC' % (ts.ts,)) out.einfo('Valid OpenPGP signature found:')
