Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Thu, 31 May 2018 09:31:36
Message-Id: 1527758437.763a95a356ab845886e56a72f823f31f6b8a3436.zmedico@gentoo
1 commit: 763a95a356ab845886e56a72f823f31f6b8a3436
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 09:20:23 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 09:20:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763a95a3
7
8 sys-apps/portage: fix --nodeps with --keep-going (bug 656942)
9
10 See: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d07a47ff3c06f6e8b2adc21ae29eecae07badc9e
11 Closes: https://bugs.gentoo.org/656942
12 Package-Manager: Portage-2.3.40, Repoman-2.3.9
13
14 sys-apps/portage/portage-2.3.40.ebuild | 4 ++++
15 1 file changed, 4 insertions(+)
16
17 diff --git a/sys-apps/portage/portage-2.3.40.ebuild b/sys-apps/portage/portage-2.3.40.ebuild
18 index 48b0a930fe7..2d28bb80148 100644
19 --- a/sys-apps/portage/portage-2.3.40.ebuild
20 +++ b/sys-apps/portage/portage-2.3.40.ebuild
21 @@ -94,6 +94,10 @@ pkg_setup() {
22 python_prepare_all() {
23 distutils-r1_python_prepare_all
24
25 + # apply d07a47ff3c06
26 + sed -i 's:("--dynamic-deps", "y") != "n"$:\0 and "--nodeps" not in myopts:' \
27 + pym/_emerge/create_depgraph_params.py || die
28 +
29 # apply 4fb5ef2ce2cb
30 sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \
31 pym/portage/util/_eventloop/EventLoop.py || die