From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-542495-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 10F351382A1 for <garchives@archives.gentoo.org>; Fri, 4 Jan 2013 07:14:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C572121C034; Fri, 4 Jan 2013 07:14:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4354B21C034 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Jan 2013 07:14:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56CEE33D852 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Jan 2013 07:14:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D396DE5439 for <gentoo-commits@lists.gentoo.org>; Fri, 4 Jan 2013 07:14:21 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <1357283647.6eff7ea1d28da8af9a30a5b8c1dcd05ed9b7638d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-ipc.py X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6eff7ea1d28da8af9a30a5b8c1dcd05ed9b7638d X-VCS-Branch: master Date: Fri, 4 Jan 2013 07:14:21 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5680e00e-5edf-4576-8a5e-890c60cbab33 X-Archives-Hash: 684695d028accf9e99baba170164ba45 commit: 6eff7ea1d28da8af9a30a5b8c1dcd05ed9b7638d Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Jan 4 07:14:07 2013 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Jan 4 07:14:07 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6eff7ea1 ebuild-ipc: fix waiting message It got disabled by commit 439151bb5b0bd2ac4c9d2dd218fe377ce0b988e6. --- bin/ebuild-ipc.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py index ceab4d5..ca707fa 100755 --- a/bin/ebuild-ipc.py +++ b/bin/ebuild-ipc.py @@ -46,7 +46,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_SECONDS = 15 + _COMMUNICATE_RETRY_TIMEOUT_MS = 15000 def __init__(self): self.fifo_dir = os.environ['PORTAGE_BUILDDIR'] @@ -106,7 +106,7 @@ class EbuildIpc(object): eof = pipe_reader.poll() is not None while not eof: - pipe_reader.scheduler.iteration() + pipe_reader._wait_loop(timeout=self._COMMUNICATE_RETRY_TIMEOUT_MS) eof = pipe_reader.poll() is not None if eof: