[gentoo-commits] proj/portage:master commit in: bin/, pym/_emerge/

[Zac Medico]

commit:     b313716f09b039957864fda3bd1e1f2b54c85586
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 19:15:59 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 19:25:37 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b313716f

AbstractPollTask: change timeout units to seconds

 bin/ebuild-ipc.py               | 6 +++---
 pym/_emerge/AbstractPollTask.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index c2773cb6a..6d0cdbef9 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -104,7 +104,7 @@ class EbuildIpc(object):
 
        # Timeout for each individual communication attempt (we retry
        # as long as the daemon process appears to be alive).
-       _COMMUNICATE_RETRY_TIMEOUT_MS = 15000
+       _COMMUNICATE_RETRY_TIMEOUT = 15 # seconds
 
        def __init__(self):
                self.fifo_dir = os.environ['PORTAGE_BUILDDIR']
@@ -161,7 +161,7 @@ class EbuildIpc(object):
                eof = fifo_writer.poll() is not None
 
                while not eof:
-                       
fifo_writer._wait_loop(timeout=self._COMMUNICATE_RETRY_TIMEOUT_MS)
+                       
fifo_writer._wait_loop(timeout=self._COMMUNICATE_RETRY_TIMEOUT)
 
                        eof = fifo_writer.poll() is not None
                        if eof:
@@ -187,7 +187,7 @@ class EbuildIpc(object):
                eof = pipe_reader.poll() is not None
 
                while not eof:
-                       
pipe_reader._wait_loop(timeout=self._COMMUNICATE_RETRY_TIMEOUT_MS)
+                       
pipe_reader._wait_loop(timeout=self._COMMUNICATE_RETRY_TIMEOUT)
                        eof = pipe_reader.poll() is not None
                        if not eof:
                                if self._daemon_is_alive():

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index 6cccb27d9..dff4b3efd 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -113,7 +113,7 @@ class AbstractPollTask(AsynchronousTask):
                tasks = [self.async_wait()]
                if timeout is not None:
                        tasks.append(asyncio.ensure_future(
-                               asyncio.sleep(timeout / 1000, loop=loop), 
loop=loop))
+                               asyncio.sleep(timeout, loop=loop), loop=loop))
                try:
                        loop.run_until_complete(asyncio.ensure_future(
                                asyncio.wait(tasks, 
return_when=asyncio.FIRST_COMPLETED,