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 1RxnLX-0000QY-5b for garchives@archives.gentoo.org; Wed, 15 Feb 2012 22:29:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BF52E08E0; Wed, 15 Feb 2012 22:29:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC53EE08E0 for ; Wed, 15 Feb 2012 22:28:59 +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 2418E1B4016 for ; Wed, 15 Feb 2012 22:28:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DCEB5E5400 for ; Wed, 15 Feb 2012 22:28:57 +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: <1329344921.b39ff144bd47952ee06bba0b549069c635d31a31.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/_MergeProcess.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b39ff144bd47952ee06bba0b549069c635d31a31 X-VCS-Branch: master Date: Wed, 15 Feb 2012 22:28:57 +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: dcb44a11-b184-4edd-af6a-3202fd3d465c X-Archives-Hash: 981627f5bb0e6ca07726e4443ef1f9a8 commit: b39ff144bd47952ee06bba0b549069c635d31a31 Author: Zac Medico gentoo org> AuthorDate: Wed Feb 15 22:28:41 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Feb 15 22:28:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db39ff144 MergeProcess: inherit stdin for use with pdb --- pym/portage/dbapi/_MergeProcess.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index 1747a09..21d43dd 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -4,6 +4,7 @@ import io import platform import signal +import sys import traceback =20 import errno @@ -40,6 +41,12 @@ class MergeProcess(SpawnProcess): settings.reset() settings.setcpv(cpv, mydb=3Dself.mydbapi) =20 + # Inherit stdin by default, so that the pdb SIGUSR1 + # handler is usable for the subprocess. + if self.fd_pipes is None: + self.fd_pipes =3D {} + self.fd_pipes.setdefault(0, sys.stdin.fileno()) + super(MergeProcess, self)._start() =20 def _lock_vdb(self):