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: Sun, 29 Apr 2018 21:29:21
Message-Id: 1525033652.6d6e7debbd768b399bba5a32156bd59bb18f737d.zmedico@gentoo
1 commit: 6d6e7debbd768b399bba5a32156bd59bb18f737d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 20:19:24 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 20:27:32 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6d6e7deb
7
8 BinpkgFetcher: fix deprecated _set_returncode (bug 654276)
9
10 The _set_returncode method is deprecated because it expects
11 an os.waitpid return value which is inconveniently
12 different from the returncode that is passed to
13 asyncio.AbstractChildWatcher.add_child_handler callbacks.
14
15 Bug: https://bugs.gentoo.org/654276
16
17 pym/_emerge/BinpkgFetcher.py | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py
21 index 2bbc0a26f..8e651a1c7 100644
22 --- a/pym/_emerge/BinpkgFetcher.py
23 +++ b/pym/_emerge/BinpkgFetcher.py
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2013 Gentoo Foundation
26 +# Copyright 1999-2018 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28
29 import functools
30 @@ -108,7 +108,7 @@ class _BinpkgFetcherProcess(SpawnProcess):
31
32 if pretend:
33 portage.writemsg_stdout("\n%s\n" % uri, noiselevel=-1)
34 - self._set_returncode((self.pid, os.EX_OK << 8))
35 + self.returncode = os.EX_OK
36 self._async_wait()
37 return