From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 906941389E2 for ; Wed, 3 Dec 2014 18:30:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0059BE0833; Wed, 3 Dec 2014 18:30:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9EC5BE0833 for ; Wed, 3 Dec 2014 18:30:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D5453404EA for ; Wed, 3 Dec 2014 18:30:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC2B8B7B0 for ; Wed, 3 Dec 2014 18:30:03 +0000 (UTC) From: "Zac Medico" 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" Message-ID: <1417631366.7c70eea2f607baffcbb9d465c03578d69b09decf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/__init__.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7c70eea2f607baffcbb9d465c03578d69b09decf X-VCS-Branch: master Date: Wed, 3 Dec 2014 18:30:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 445983e8-899b-495b-9a68-0824dcb0e67d X-Archives-Hash: 68bb10ef0364af451ed3f9feb49327a0 commit: 7c70eea2f607baffcbb9d465c03578d69b09decf Author: Zac Medico gentoo org> AuthorDate: Wed Dec 3 08:44:40 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 3 18:29:26 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7c70eea2 portage.os.waitpid: handle EINTR for bug #525552 Use a new _eintr_func_wrapper class to wrap waitpid calls and handle EINTR by calling the function as many times as necessary (until it returns without raising EINTR). X-Gentoo-Bug: 525552 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=525552 Acked-by: Alexander Berntsen gentoo.org> --- pym/portage/__init__.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d8046f3..4ce92f5 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -320,12 +320,36 @@ class _unicode_module_wrapper(object): cache[attr] = result return result +class _eintr_func_wrapper(object): + """ + Wraps a function and handles EINTR by calling the function as + many times as necessary (until it returns without raising EINTR). + """ + + __slots__ = ('_func',) + + def __init__(self, func): + self._func = func + + def __call__(self, *args, **kwargs): + + while True: + try: + rval = self._func(*args, **kwargs) + break + except OSError as e: + if e.errno != errno.EINTR: + raise + + return rval + import os as _os _os_overrides = { id(_os.fdopen) : _os.fdopen, id(_os.popen) : _os.popen, id(_os.read) : _os.read, id(_os.system) : _os.system, + id(_os.waitpid) : _eintr_func_wrapper(_os.waitpid) }