summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-21 04:20:15 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-21 04:20:15 +0000
commit48076613ea19a83142a6c8366a050fe5cee210b8 (patch)
treebfb55575d79c37dd920ac347a2ee37b7bf0bf34b
parent7ace238bb48e4e1f303879e9f4903a4cc95039c9 (diff)
downloadportage-48076613ea19a83142a6c8366a050fe5cee210b8.tar.gz
portage-48076613ea19a83142a6c8366a050fe5cee210b8.tar.bz2
portage-48076613ea19a83142a6c8366a050fe5cee210b8.zip
For bug #185930, direct all FETCHCOMMAND output to stdout.
svn path=/main/trunk/; revision=7330
-rw-r--r--pym/portage/__init__.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4494caeb2..8f0b2205f 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2839,6 +2839,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({