For bug #185930, direct all FETCHCOMMAND output to stdout. (trunk r7330)

svn path=/main/branches/2.1.2/; revision=7331

diff --git a/pym/portage.py b/pym/portage.py
index b7d9382374210a3b67d196a455eaaf3cd11fe110..3de399cf42e56493556fcd0150fe3fc1956d813a 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2728,6 +2728,14 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                        myfetch = [varexpand(x, mydict=variables) for x in lexer]
 
                                        spawn_keywords = {}
+                                       # Redirect all output to stdout since some fetchers like
+                                       # wget pollute stderr (if portage detects a problem then it
+                                       # can send it's own message to stderr).
+                                       spawn_keywords["fd_pipes"] = {
+                                               0:sys.stdin.fileno(),
+                                               1:sys.stdout.fileno(),
+                                               2:sys.stdout.fileno()
+                                       }
                                        if "userfetch" in mysettings.features and \
                                                os.getuid() == 0 and portage_gid and portage_uid:
                                                spawn_keywords.update({