| 1 |
commit: d9699fa0b09a1d5a397edf0bb25c7662ac88e09d |
| 2 |
Author: Sheng Yu <syu.os <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Wed Nov 30 18:13:29 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 30 22:28:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d9699fa0 |
| 7 |
|
| 8 |
Properly assign filenames for remote packages |
| 9 |
|
| 10 |
Signed-off-by: Sheng Yu <syu.os <AT> protonmail.com> |
| 11 |
Closes: https://github.com/gentoo/portage/pull/950 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
NEWS | 2 ++ |
| 15 |
lib/portage/dbapi/bintree.py | 2 +- |
| 16 |
2 files changed, 3 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/NEWS b/NEWS |
| 19 |
index 923b95a43..1cb2b2468 100644 |
| 20 |
--- a/NEWS |
| 21 |
+++ b/NEWS |
| 22 |
@@ -49,6 +49,8 @@ Bug fixes: |
| 23 |
* env-update: Also generate PATH definition in systemd user environment file |
| 24 |
/etc/environment.d/10-gentoo-env.conf |
| 25 |
|
| 26 |
+* bintree: Properly assign filenames for remote binpkgs. |
| 27 |
+ |
| 28 |
* --disable-static is only passed for libtool-enabled configure scripts in EAPI 8. |
| 29 |
This avoids annoying warnings when a configure script has a flag such as |
| 30 |
--disable-static_link that would then trigger a QA warning (bug #814380). |
| 31 |
|
| 32 |
diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py |
| 33 |
index d7c18e2e9..baf001c8f 100644 |
| 34 |
--- a/lib/portage/dbapi/bintree.py |
| 35 |
+++ b/lib/portage/dbapi/bintree.py |
| 36 |
@@ -2031,7 +2031,7 @@ class binarytree: |
| 37 |
filename = None |
| 38 |
build_id = None |
| 39 |
if allocate_new: |
| 40 |
- filename, build_id = self._allocate_filename(cpv) |
| 41 |
+ filename, build_id = self._allocate_filename(cpv, remote_binpkg_format) |
| 42 |
elif self._is_specific_instance(cpv): |
| 43 |
instance_key = self.dbapi._instance_key(cpv) |
| 44 |
path = self._pkg_paths.get(instance_key) |
Archives