public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: /, lib/portage/dbapi/
Date: Wed, 30 Nov 2022 22:29:05 +0000 (UTC)	[thread overview]
Message-ID: <1669847338.d9699fa0b09a1d5a397edf0bb25c7662ac88e09d.sam@gentoo> (raw)

commit:     d9699fa0b09a1d5a397edf0bb25c7662ac88e09d
Author:     Sheng Yu <syu.os <AT> protonmail <DOT> com>
AuthorDate: Wed Nov 30 18:13:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 22:28:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d9699fa0

Properly assign filenames for remote packages

Signed-off-by: Sheng Yu <syu.os <AT> protonmail.com>
Closes: https://github.com/gentoo/portage/pull/950
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS                         | 2 ++
 lib/portage/dbapi/bintree.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 923b95a43..1cb2b2468 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,8 @@ Bug fixes:
 * env-update: Also generate PATH definition in systemd user environment file
   /etc/environment.d/10-gentoo-env.conf
 
+* bintree: Properly assign filenames for remote binpkgs.
+
 * --disable-static is only passed for libtool-enabled configure scripts in EAPI 8.
   This avoids annoying warnings when a configure script has a flag such as
   --disable-static_link that would then trigger a QA warning (bug #814380).

diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index d7c18e2e9..baf001c8f 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -2031,7 +2031,7 @@ class binarytree:
         filename = None
         build_id = None
         if allocate_new:
-            filename, build_id = self._allocate_filename(cpv)
+            filename, build_id = self._allocate_filename(cpv, remote_binpkg_format)
         elif self._is_specific_instance(cpv):
             instance_key = self.dbapi._instance_key(cpv)
             path = self._pkg_paths.get(instance_key)


             reply	other threads:[~2022-11-30 22:29 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-30 22:29 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-04-07  9:52 [gentoo-commits] proj/portage:master commit in: /, lib/portage/dbapi/ Sam James
2023-09-26 20:54 Sam James
2024-01-02  4:46 Sam James
2024-10-27 23:13 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=1669847338.d9699fa0b09a1d5a397edf0bb25c7662ac88e09d.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