From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AC7B158200 for ; Sun, 14 Sep 2025 00:15:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 21115340D6F for ; Sun, 14 Sep 2025 00:15:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 268C6110571; Sun, 14 Sep 2025 00:15:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1CE2C110571 for ; Sun, 14 Sep 2025 00:15:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEE60340D6F for ; Sun, 14 Sep 2025 00:15:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F1FB2783 for ; Sun, 14 Sep 2025 00:15:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1757808905.ebd2bf2b6d8ecd1e68f16e9f2672f09c2647c997.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/dbapi/bintree.py X-VCS-Directories: lib/portage/dbapi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ebd2bf2b6d8ecd1e68f16e9f2672f09c2647c997 X-VCS-Branch: master Date: Sun, 14 Sep 2025 00:15:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3cebeb0-f8bb-40af-99e6-24d4e27230e9 X-Archives-Hash: 0a528c9e14d20cfda86a8157dbcef079 commit: ebd2bf2b6d8ecd1e68f16e9f2672f09c2647c997 Author: Florian Schmaus gentoo org> AuthorDate: Sat Sep 13 18:36:08 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 14 00:15:05 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ebd2bf2b bintree: Add missing 'break' in UseCachedCopyOfRemoteIndex When we added support to fetch Packages.gz first, a new lopo was added to the _populate_remote() logic, iterating over ("Packages.gz", "Packages"). There are two situtations where we want to break out of the loop: when the remote package index was fetched or when the cached version of the package index was used. However, fd55382a4935 ("bintree: Accelerate index fetch by requesting Packages.gz first"), only added a break statement for the first case (successful fetch). This adds the missing break statement for the second case (use cached version). Fixes: fd55382a4935 ("bintree: Accelerate index fetch by requesting Packages.gz first") Signed-off-by: Florian Schmaus gentoo.org> Part-of: https://github.com/gentoo/portage/pull/1465 Signed-off-by: Sam James gentoo.org> lib/portage/dbapi/bintree.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py index 46f5e7f8b9..9d695059d6 100644 --- a/lib/portage/dbapi/bintree.py +++ b/lib/portage/dbapi/bintree.py @@ -1670,6 +1670,7 @@ class binarytree: ) + "\n" ) + break except OSError as e: if ( remote_pkgindex_file == "Packages.gz"