From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
Date: Tue, 17 Jun 2025 02:58:40 +0000 (UTC) [thread overview]
Message-ID: <1750129112.f64504e61f1bf1c76999b0e77a7546ffe4052e07.sam@gentoo> (raw)
commit: f64504e61f1bf1c76999b0e77a7546ffe4052e07
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 15 19:15:15 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 17 02:58:32 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f64504e6
binarytree: Relax local vs remote timestamp comparision
There seems to be a slight timestamp inconsistency that causes the
"local_timestamp != remote_timestap" expression to always evaluate to
true.
For example, on one of my systems, using
https://distfiles.gentoo.org/releases/amd64/binpackages/23.0/x86-64 as
as binhost, I end up with
remote timestamp: 1749900593
local timestamp: 1749907793
The local timestamp is newer than the remote one. However portage
still performs expensive operations if "local_timestamp !=
remote_timestaps", causing a noticeable delay. Interestingly, it will
still print
Local copy of remote index is up-to-date and will be used.
Changing the condition from
local_timestamp != remote_timestamp
to
local_timestamp < remote_timestamp
makes portage nearly immediately print the "Local copy … is up-to-date"
message, where it previously would take some seconds.
[sam: Add two bug tags.]
Bug: https://bugs.gentoo.org/958200
Bug: https://bugs.gentoo.org/958236
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Part-of: https://github.com/gentoo/portage/pull/1443
Closes: https://github.com/gentoo/portage/pull/1443
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/portage/dbapi/bintree.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 9da7898569..90f213f1cb 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -1558,7 +1558,9 @@ class binarytree:
noiselevel=-1,
)
pkgindex = None
- elif local_timestamp != remote_timestamp:
+ elif not local_timestamp or int(local_timestamp) < int(
+ remote_timestamp
+ ):
rmt_idx.readBody(f_dec)
pkgindex = rmt_idx
finally:
next reply other threads:[~2025-06-17 2:58 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-17 2:58 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-16 15:40 [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/ Sam James
2025-09-15 12:21 Sam James
2025-09-15 12:21 Sam James
2025-09-15 11:14 Sam James
2025-09-15 11:14 Sam James
2025-09-15 11:14 Sam James
2025-09-15 11:14 Sam James
2025-09-14 9:33 Sam James
2025-09-14 0:15 Sam James
2025-09-14 0:15 Sam James
2025-09-12 21:18 Sam James
2025-09-12 21:18 Sam James
2025-09-11 20:37 Sam James
2025-09-11 18:07 Sam James
2025-09-11 11:27 Sam James
2025-09-11 3:17 Sam James
2025-09-11 0:07 Sam James
2025-06-24 1:09 Sam James
2025-01-24 21:29 Zac Medico
2025-01-09 23:35 Zac Medico
2024-06-01 19:20 Zac Medico
2024-05-27 18:13 Zac Medico
2024-03-02 22:55 Zac Medico
2024-02-25 8:25 Sam James
2024-01-16 7:52 Sam James
2024-01-16 5:26 Zac Medico
2024-01-16 5:16 Sam James
2024-01-16 5:16 Sam James
2024-01-03 5:57 Zac Medico
2023-12-10 1:28 Zac Medico
2023-10-24 18:37 Zac Medico
2023-10-23 14:28 Zac Medico
2023-10-22 21:30 Zac Medico
2023-10-22 20:58 Zac Medico
2023-10-22 15:53 Zac Medico
2023-10-20 0:34 Zac Medico
2023-10-15 22:02 Zac Medico
2023-10-08 19:48 Zac Medico
2023-10-05 5:45 Zac Medico
2023-10-04 4:29 Zac Medico
2023-09-26 21:09 Sam James
2023-09-23 22:49 Sam James
2023-09-23 22:38 Sam James
2023-09-23 22:31 Sam James
2023-09-20 18:02 Mike Gilbert
2023-09-15 4:28 Sam James
2023-07-29 3:57 Sam James
2023-05-23 0:26 Sam James
2023-05-23 0:26 Sam James
2023-05-23 0:26 Sam James
2022-12-21 1:30 Sam James
2022-12-21 1:28 Sam James
2022-11-08 23:07 Sam James
2022-09-25 19:12 Mike Gilbert
2022-09-09 10:16 Michał Górny
2022-08-18 19:00 Mike Gilbert
2022-04-20 20:24 Zac Medico
2022-04-13 15:34 Sam James
2022-04-13 15:34 Sam James
2021-11-26 21:09 Mike Gilbert
2021-09-21 5:51 Zac Medico
2021-09-21 5:51 Zac Medico
2021-09-21 5:51 Zac Medico
2021-06-05 18:08 Zac Medico
2021-03-07 11:42 Zac Medico
2021-02-23 21:31 Zac Medico
2021-01-18 9:20 Zac Medico
2021-01-17 13:31 Zac Medico
2021-01-17 8:49 Zac Medico
2021-01-17 8:49 Zac Medico
2020-09-08 2:52 Zac Medico
2020-08-09 0:15 Zac Medico
2020-08-04 3:16 Zac Medico
2020-08-03 23:28 Zac Medico
2020-08-03 23:28 Zac Medico
2020-08-03 21:42 Zac Medico
2020-08-03 21:42 Zac Medico
2020-08-03 19:30 Zac Medico
2020-07-22 20:14 Zac Medico
2020-07-22 19:52 Zac Medico
2020-07-22 17:46 Zac Medico
2020-06-07 3:26 Zac Medico
2020-02-20 9:55 Zac Medico
2020-02-03 3:04 Zac Medico
2019-08-24 3:15 Zac Medico
2019-06-20 19:43 Zac Medico
2019-05-11 21:16 Zac Medico
2019-01-20 6:55 Zac Medico
2019-01-11 10:14 Fabian Groffen
2018-09-24 7:30 Zac Medico
2018-09-24 0:46 Zac Medico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1750129112.f64504e61f1bf1c76999b0e77a7546ffe4052e07.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox