Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Thu, 31 May 2018 08:44:31
Message-Id: 1527755265.d07a47ff3c06f6e8b2adc21ae29eecae07badc9e.zmedico@gentoo
1 commit: d07a47ff3c06f6e8b2adc21ae29eecae07badc9e
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 08:27:45 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 08:27:45 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d07a47ff
7
8 emerge: make --nodeps disable --dynamic-deps (bug 656942)
9
10 Since --nodeps disable's the depgraph's _dynamic_deps_preload code,
11 calls to BlockerDB can trigger inappropriate calls to the FakeVartree
12 _aux_get_wrapper method, triggering event loop recursion. Therefore,
13 make --nodeps disable --dynamic-deps, in order to eliminate the
14 inappropriate _aux_get_wrapper calls.
15
16 Bug: https://bugs.gentoo.org/656942
17
18 pym/_emerge/create_depgraph_params.py | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21 diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
22 index 1fd1f5e36..08605baa1 100644
23 --- a/pym/_emerge/create_depgraph_params.py
24 +++ b/pym/_emerge/create_depgraph_params.py
25 @@ -48,7 +48,7 @@ def create_depgraph_params(myopts, myaction):
26 myparams["ignore_soname_deps"] = myopts.get(
27 "--ignore-soname-deps", "y")
28
29 - dynamic_deps = myopts.get("--dynamic-deps", "y") != "n"
30 + dynamic_deps = myopts.get("--dynamic-deps", "y") != "n" and "--nodeps" not in myopts
31 if dynamic_deps:
32 myparams["dynamic_deps"] = True