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