aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2015-02-14 11:10:59 -0800
committerZac Medico <zmedico@gentoo.org>2015-02-14 11:10:59 -0800
commit036e3c0568734195a472a38b533ec3091b43fba6 (patch)
tree2645e6dda1445fc4bc6b3c9841aea9b3b085f25c
parentdepgraph: soname dependency resolution (bug 282639) (diff)
downloadportage-036e3c0568734195a472a38b533ec3091b43fba6.tar.gz
portage-036e3c0568734195a472a38b533ec3091b43fba6.tar.bz2
portage-036e3c0568734195a472a38b533ec3091b43fba6.zip
Fix random SonameOrChoicesTestCase failure
In commit 11467fc640995e3dc8897c82bbc7130d5bf27d05, the atom_not_selected variable was initialized outside of a loop, when it should have been re-initialized for each iteration of the loop. This caused atom_not_selected to have an incorrect value in some cases, triggering random failures of SonameOrChoicesTestCase, as observed here: https://travis-ci.org/gentoo/portage/jobs/50673911#L1114 Fixes: 11467fc64099 ("depgraph: soname dependency resolution (bug 282639)")
-rw-r--r--pym/_emerge/depgraph.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 63c89a4e6..e8a311032 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1860,9 +1860,9 @@ class depgraph(object):
replacement_candidates = []
# Set of all packages all atoms can agree on.
all_candidate_pkgs = None
- atom_not_selected = False
for atom in atoms:
+ atom_not_selected = False
if not atom.package:
unevaluated_atom = None