Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] Fix random SonameOrChoicesTestCase failure
Date: Sat, 14 Feb 2015 19:12:17
Message-Id: 1423941116-12804-1-git-send-email-zmedico@gentoo.org
1 In commit 11467fc640995e3dc8897c82bbc7130d5bf27d05, the
2 atom_not_selected variable was initialized outside of a loop, when it
3 should have been re-initialized for each iteration of the loop. This
4 caused atom_not_selected to have an incorrect value in some cases,
5 triggering random failures of SonameOrChoicesTestCase, as observed here:
6
7 https://travis-ci.org/gentoo/portage/jobs/50673911#L1114
8
9 Fixes: 11467fc64099 ("depgraph: soname dependency resolution (bug 282639)")
10 ---
11 pym/_emerge/depgraph.py | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
15 index 63c89a4..e8a3110 100644
16 --- a/pym/_emerge/depgraph.py
17 +++ b/pym/_emerge/depgraph.py
18 @@ -1860,9 +1860,9 @@ class depgraph(object):
19 replacement_candidates = []
20 # Set of all packages all atoms can agree on.
21 all_candidate_pkgs = None
22 - atom_not_selected = False
23
24 for atom in atoms:
25 + atom_not_selected = False
26
27 if not atom.package:
28 unevaluated_atom = None
29 --
30 2.0.5

Replies