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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89483138350 for ; Mon, 3 Feb 2020 20:30:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D63DE0801; Mon, 3 Feb 2020 20:30:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C510E0801 for ; Mon, 3 Feb 2020 20:30:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0AC734E64A for ; Mon, 3 Feb 2020 20:30:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 782658F for ; Mon, 3 Feb 2020 20:30:37 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1580761756.7c6fda0e063ecc1f2411eaad20ea369dffd5bfe5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/create_world_atom.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7c6fda0e063ecc1f2411eaad20ea369dffd5bfe5 X-VCS-Branch: master Date: Mon, 3 Feb 2020 20:30:37 +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: 96709b62-d8f9-4319-b8d9-2fb550c21cc1 X-Archives-Hash: 063b6971e1cc5c7db94de4fcf71a5447 commit: 7c6fda0e063ecc1f2411eaad20ea369dffd5bfe5 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 3 20:10:01 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 3 20:29:16 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7c6fda0e create_world_atom: fix outdated comments regarding greedy atoms Fixes: 1342b456c460 ("Remove --update greedy SLOTs code from depgraph.select_files()") Reported-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Zac Medico gentoo.org> lib/_emerge/create_world_atom.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/_emerge/create_world_atom.py b/lib/_emerge/create_world_atom.py index c5e1f58be..277bd0777 100644 --- a/lib/_emerge/create_world_atom.py +++ b/lib/_emerge/create_world_atom.py @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import sys @@ -15,8 +15,8 @@ def create_world_atom(pkg, args_set, root_config, before_install=False): """Create a new atom for the world file if one does not exist. If the argument atom is precise enough to identify a specific slot then a slot atom will be returned. Atoms that are in the system set may also be stored - in world since system atoms can only match one slot while world atoms can - be greedy with respect to slots. Unslotted system packages will not be + in world since a user might want to select muliple slots of a slotted + package like gcc for example. Unslotted system packages will not be stored in world.""" arg_atom = args_set.findAtomForPackage(pkg) @@ -111,8 +111,9 @@ def create_world_atom(pkg, args_set, root_config, before_install=False): # Both atoms would be identical, so there's nothing to add. return None if not slotted and not arg_atom.repo: - # Unlike world atoms, system atoms are not greedy for slots, so they - # can't be safely excluded from world if they are slotted. + # Don't exclude slotted atoms for system packages from world, since + # a user might want to select muliple slots of a slotted package like + # gcc for example. system_atom = sets["system"].findAtomForPackage(pkg) if system_atom: if not system_atom.cp.startswith("virtual/"):