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