From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RaW8y-0001XB-GS for garchives@archives.gentoo.org; Tue, 13 Dec 2011 17:27:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CDA421C06F; Tue, 13 Dec 2011 17:27:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 30E9F21C06F for ; Tue, 13 Dec 2011 17:27:48 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABF2B1B4028 for ; Tue, 13 Dec 2011 17:27:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E1CDC8004A for ; Tue, 13 Dec 2011 17:27:46 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AbstractEbuildProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a3797a63a30579be3ba5418aad7e76fd520f9aee Date: Tue, 13 Dec 2011 17:27:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1a2b89a9-09ee-4171-b403-9fdc535acce0 X-Archives-Hash: 25718d00dd2847b28cf7d53ef0276cdb commit: a3797a63a30579be3ba5418aad7e76fd520f9aee Author: Zac Medico gentoo org> AuthorDate: Tue Dec 13 17:27:38 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Dec 13 17:27:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da3797a63 AbstractEbuildProcess: null in if not interactive --- pym/_emerge/AbstractEbuildProcess.py | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractE= buildProcess.py index 4147ecb..6e1491b 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -92,7 +92,19 @@ class AbstractEbuildProcess(SpawnProcess): else: self.settings.pop('PORTAGE_EBUILD_EXIT_FILE', None) =20 - SpawnProcess._start(self) + if self.fd_pipes is None: + self.fd_pipes =3D {} + null_fd =3D None + if 0 not in self.fd_pipes and \ + "interactive" not in self.settings.get("PROPERTIES", "").split(): + null_fd =3D os.open('/dev/null', os.O_RDONLY) + self.fd_pipes[0] =3D null_fd + + try: + SpawnProcess._start(self) + finally: + if null_fd is not None: + os.close(null_fd) =20 def _init_ipc_fifos(self): =20