From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 16 Feb 2012 00:25:31 +0000 (-0800)
Subject: SpawnProcess: use os.open for /dev/null input
X-Git-Tag: v2.2.0_alpha87~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4862a0c5627e13cb3618779b41ef0fe0edae148b;p=portage.git

SpawnProcess: use os.open for /dev/null input
---

diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index 05c4768d4..9fbc96472 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -59,8 +59,8 @@ class SpawnProcess(SubProcess):
 			# access to stdin. Until then, use /dev/null so that any
 			# attempts to read from stdin will immediately return EOF
 			# instead of blocking indefinitely.
-			null_input = open('/dev/null', 'rb')
-			fd_pipes[0] = null_input.fileno()
+			null_input = os.open('/dev/null', os.O_RDWR)
+			fd_pipes[0] = null_input
 
 		fd_pipes.setdefault(0, sys.stdin.fileno())
 		fd_pipes.setdefault(1, sys.stdout.fileno())
@@ -123,7 +123,7 @@ class SpawnProcess(SubProcess):
 
 		os.close(slave_fd)
 		if null_input is not None:
-			null_input.close()
+			os.close(null_input)
 
 		if isinstance(retval, int):
 			# spawn failed