From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
Date: Sun, 10 Dec 2023 01:28:48 +0000 (UTC) [thread overview]
Message-ID: <1702171663.cc372a52ee2aba153c0d7c2290306b7f623e8b7c.zmedico@gentoo> (raw)
commit: cc372a52ee2aba153c0d7c2290306b7f623e8b7c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 23:58:07 2023 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 01:27:43 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc372a52
bindbapi: add SIZE to _pkg_str_aux_keys
The _pkg_str_aux_keys are used inside dbapi.update_ents,
and need to contain SIZE in order for the fakedbapi
_instance_key_multi_instance method to operate correctly.
Incorrect operation of _instance_key_multi_instance could
prevent binarytree.inject from removing an old instance
from its internal state. It could also trigger a KeyError
in bindbapi.aux_update as in bug 918597, since it could
cause binarytree.getname to return a non-existent path.
It could also cause binarytree.getname to return an
existing but incorrect path, which might trigger an
InvalidBinaryPackageFormat exception as in bug 906675.
Bug: https://bugs.gentoo.org/906675
Bug: https://bugs.gentoo.org/918597
Bug: https://bugs.gentoo.org/919668
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/dbapi/bintree.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index a6e1f9773d..9c9ac66334 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -84,9 +84,12 @@ class bindbapi(fakedbapi):
_known_keys = frozenset(
list(fakedbapi._known_keys) + ["CHOST", "repository", "USE"]
)
+ # Must include keys used to create _pkg_str attributes used in
+ # the fakedbapi _instance_key_multi_instance method.
_pkg_str_aux_keys = fakedbapi._pkg_str_aux_keys + (
"BUILD_ID",
"BUILD_TIME",
+ "SIZE",
"_mtime_",
)
next reply other threads:[~2023-12-10 1:28 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-10 1:28 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-24 1:09 [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/ Sam James
2025-06-17 2:58 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-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=1702171663.cc372a52ee2aba153c0d7c2290306b7f623e8b7c.zmedico@gentoo \
--to=zmedico@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