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 289C6138350 for ; Mon, 10 Feb 2020 05:12:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FE9CE08D3; Mon, 10 Feb 2020 05:11:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1E3B9E08D3 for ; Mon, 10 Feb 2020 05:11:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6715B34E972 for ; Mon, 10 Feb 2020 05:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11A7B10F for ; Mon, 10 Feb 2020 05:11:55 +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: <1581311123.ab472882b13ebe7a8a649c723928250dc8aeb740.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/depgraph.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ab472882b13ebe7a8a649c723928250dc8aeb740 X-VCS-Branch: master Date: Mon, 10 Feb 2020 05:11:55 +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: a59883bf-2a93-4fa8-a2a3-01f8a18743eb X-Archives-Hash: b69ccf03b335b9a245f6da652397bbf6 commit: ab472882b13ebe7a8a649c723928250dc8aeb740 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 10 05:04:20 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 10 05:05:23 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ab472882 depgraph: sort package set atoms for consistent results Traverse the unordered set returned from PackageSet.getAtoms() in sorted order, for more consistent results. Bug: https://bugs.gentoo.org/649622 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 1eaf20035..dd29b607c 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -4383,7 +4383,7 @@ class depgraph(object): args = self._dynamic_config._initial_arg_list[:] for arg in self._expand_set_args(args, add_to_digraph=True): - for atom in arg.pset.getAtoms(): + for atom in sorted(arg.pset.getAtoms()): self._spinner_update() dep = Dependency(atom=atom, onlydeps=onlydeps, root=myroot, parent=arg) @@ -6975,7 +6975,7 @@ class depgraph(object): self._set_args(args) for arg in self._expand_set_args(args, add_to_digraph=True): - for atom in arg.pset.getAtoms(): + for atom in sorted(arg.pset.getAtoms(), reverse=True): self._dynamic_config._dep_stack.append( Dependency(atom=atom, root=arg.root_config.root, parent=arg, depth=self._UNREACHABLE_DEPTH)) @@ -9366,7 +9366,7 @@ class depgraph(object): # added via _add_pkg() so that they are included in the # digraph (needed at least for --tree display). for arg in self._expand_set_args(args, add_to_digraph=True): - for atom in arg.pset.getAtoms(): + for atom in sorted(arg.pset.getAtoms()): pkg, existing_node = self._select_package( arg.root_config.root, atom) if existing_node is None and \