Merged from trunk 11036:11037

   | 11037   | In can_poll_tty(), direct bash's stderr into the pty since   |
   | zmedico | we don't want so see any error message it generates (due to  |
   |         | PipeReader closing it's end of the pty). The error message   |
   |         | is irrelevant since all we want to know is whether or not    |
   |         | the data is successfully transmitted through the pty.        |

svn path=/main/branches/prefix/; revision=11038

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8cc3cf817e38aecead11238b5a17e20993021425..a67fd5edf0a731b6bf29e9d1e98112d374713bc5 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8050,7 +8050,7 @@ def can_poll_pty():
 
        producer = SpawnProcess(
                args=["bash", "-c", "echo -n '%s'" % test_string],
-               fd_pipes={1:slave_fd}, scheduler=scheduler)
+               fd_pipes={1:slave_fd,2:slave_fd}, scheduler=scheduler)
 
        consumer = PipeReader(
                input_files={"producer" : master_file},