summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-02-15 14:28:41 -0800
committerZac Medico <zmedico@gentoo.org>2012-02-15 14:28:41 -0800
commitb39ff144bd47952ee06bba0b549069c635d31a31 (patch)
tree62b879949f5052b57b64903101dfded5931c0735
parentfb89e5a829dfe0083b921c8c3958a3341d055cf8 (diff)
downloadportage-b39ff144bd47952ee06bba0b549069c635d31a31.tar.gz
portage-b39ff144bd47952ee06bba0b549069c635d31a31.tar.bz2
portage-b39ff144bd47952ee06bba0b549069c635d31a31.zip
MergeProcess: inherit stdin for use with pdb
-rw-r--r--pym/portage/dbapi/_MergeProcess.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py
index 1747a098b..21d43dd83 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
import errno
@@ -40,6 +41,12 @@ class MergeProcess(SpawnProcess):
settings.reset()
settings.setcpv(cpv, mydb=self.mydbapi)
+ # Inherit stdin by default, so that the pdb SIGUSR1
+ # handler is usable for the subprocess.
+ if self.fd_pipes is None:
+ self.fd_pipes = {}
+ self.fd_pipes.setdefault(0, sys.stdin.fileno())
+
super(MergeProcess, self)._start()
def _lock_vdb(self):