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 1RKGf4-00063L-Kj for garchives@archives.gentoo.org; Sat, 29 Oct 2011 21:41:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FF4221C028; Sat, 29 Oct 2011 21:41:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CE09C21C028 for ; Sat, 29 Oct 2011 21:41:46 +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 388EB1B4011 for ; Sat, 29 Oct 2011 21:41:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A268980042 for ; Sat, 29 Oct 2011 21:41:45 +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: <1811def4b0ebc8af2280dde7f84331301b4eddd3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildMetadataPhase.py pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1811def4b0ebc8af2280dde7f84331301b4eddd3 Date: Sat, 29 Oct 2011 21:41:45 +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: X-Archives-Hash: 7e84dac78b06ea8a48278d2ec9ab2187 commit: 1811def4b0ebc8af2280dde7f84331301b4eddd3 Author: Zac Medico gentoo org> AuthorDate: Sat Oct 29 21:41:38 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 29 21:41:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1811def4 EbuildMetadataPhase: use /dev/null for stdin --- pym/_emerge/EbuildMetadataPhase.py | 4 +++- pym/_emerge/actions.py | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index bf562c5..16948df 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -63,7 +63,8 @@ class EbuildMetadataPhase(SubProcess): else: fd_pipes =3D {} =20 - fd_pipes.setdefault(0, sys.stdin.fileno()) + null_input =3D open('/dev/null', 'rb') + fd_pipes.setdefault(0, null_input.fileno()) fd_pipes.setdefault(1, sys.stdout.fileno()) fd_pipes.setdefault(2, sys.stderr.fileno()) =20 @@ -96,6 +97,7 @@ class EbuildMetadataPhase(SubProcess): fd_pipes=3Dfd_pipes, returnpid=3DTrue) =20 os.close(slave_fd) + null_input.close() =20 if isinstance(retval, int): # doebuild failed before spawning diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 28fe549..036b471 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1864,12 +1864,6 @@ def action_regen(settings, portdb, max_jobs, max_l= oad): xterm_titles =3D "notitles" not in settings.features emergelog(xterm_titles, " =3D=3D=3D regen") #regenerate cache entries - try: - os.close(sys.stdin.fileno()) - except SystemExit: - raise # Needed else can't exit - except: - pass sys.stdout.flush() =20 regen =3D MetadataRegen(portdb, max_jobs=3Dmax_jobs, max_load=3Dmax_loa= d)