From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79E2515811D for ; Thu, 22 Jun 2023 08:47:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B864BE08D6; Thu, 22 Jun 2023 08:47:17 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BE60E08D6 for ; Thu, 22 Jun 2023 08:47:17 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69B39340C72 for ; Thu, 22 Jun 2023 08:47:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABC03990 for ; Thu, 22 Jun 2023 08:47:14 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1687423628.9ac8c8b9062b316d266f8a5ed678143eee9d2d1e.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 9ac8c8b9062b316d266f8a5ed678143eee9d2d1e X-VCS-Branch: prefix Date: Thu, 22 Jun 2023 08:47:14 +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: 71c1f084-9325-4a9e-896b-53a167428404 X-Archives-Hash: a8bb192a7d74ba3883774a49ed2337bd commit: 9ac8c8b9062b316d266f8a5ed678143eee9d2d1e Author: Fabian Groffen gentoo org> AuthorDate: Thu Jun 22 08:46:28 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jun 22 08:47:08 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ac8c8b9 Merge remote-tracking branch 'origin/master' into prefix Signed-off-by: Fabian Groffen gentoo.org> NEWS | 4 +--- lib/_emerge/depgraph.py | 4 +++- lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py | 2 +- ...st_unecessary_slot_upgrade.py => test_unnecessary_slot_upgrade.py} | 0 setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)