Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] Re: [PATCH 2/2] depgraph: fix missed llvm update (bug 584626)
Date: Thu, 23 Jun 2016 09:24:34
Message-Id: 576BAACD.6000902@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 2/2] depgraph: fix missed llvm update (bug 584626) by Zac Medico
1 On 06/23/2016 12:38 AM, Zac Medico wrote:
2 > diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
3 > index f78f08d..ef3cc5d 100644
4 > --- a/pym/_emerge/depgraph.py
5 > +++ b/pym/_emerge/depgraph.py
6 > @@ -1822,6 +1822,22 @@ class depgraph(object):
7 > # necessarily relevant.
8 > continue
9 >
10 > + if (not self._frozen_config.excluded_pkgs.
11 > + findAtomForPackage(parent,
12 > + modified_use=self._pkg_use_enabled(parent)) and
13 > + self._upgrade_available(parent)):
14 > + want_update = False
15 > + for grandparent in self._dynamic_config.digraph.\
16 > + parent_nodes(parent):
17 > + if self._want_update_pkg(grandparent, parent):
18 > + want_update = True
19 > + break
20 > +
21 > + if want_update:
22 > + # This parent may be irrelevant, since an
23 > + # update is available (see bug 584626).
24 > + continue
25 > +
26
27 I've simplified this as follows:
28
29 if (not self._too_deep(parent.depth) and
30 not self._frozen_config.excluded_pkgs.
31 findAtomForPackage(parent,
32 modified_use=self._pkg_use_enabled(parent)) and
33 self._upgrade_available(parent)):
34 # This parent may be irrelevant, since an
35 # update is available (see bug 584626).
36 continue
37
38 --
39 Thanks,
40 Zac