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 1ACCE158089 for ; Sat, 23 Sep 2023 22:38:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47C8C2BC014; Sat, 23 Sep 2023 22:38:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 pigeon.gentoo.org (Postfix) with ESMTPS id 324162BC014 for ; Sat, 23 Sep 2023 22:38:39 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66815340824 for ; Sat, 23 Sep 2023 22:38:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF1411242 for ; Sat, 23 Sep 2023 22:38:36 +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: <1695508711.1fc674667de01944269dfeccd70472facf83e7ba.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/dbapi/vartree.py X-VCS-Directories: lib/portage/dbapi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1fc674667de01944269dfeccd70472facf83e7ba X-VCS-Branch: master Date: Sat, 23 Sep 2023 22:38:36 +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: 35aedc13-1b03-4841-9245-ff370516cd78 X-Archives-Hash: 3851e34cecfe0d822f39afa9b1df834d commit: 1fc674667de01944269dfeccd70472facf83e7ba Author: Sam James gentoo org> AuthorDate: Sat Sep 23 22:38:23 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 23 22:38:31 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1fc67466 vartree: don't clobber pkgfiles Fixes: 743722ccfa234dd9d4a54f7fbfb14cc2ddf6f0f4 Signed-off-by: Sam James gentoo.org> lib/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py index 35a401b33c..878914ef06 100644 --- a/lib/portage/dbapi/vartree.py +++ b/lib/portage/dbapi/vartree.py @@ -2687,7 +2687,7 @@ class dblink: unmerge_orphans = "unmerge-orphans" in self.settings.features calc_prelink = "prelink-checksums" in self.settings.features - pkgfiles = self.getcontents() + pkgfiles = self.getcontents() if not pkgfiles if pkgfiles: self.updateprotect() mykeys = list(pkgfiles)