From 48076613ea19a83142a6c8366a050fe5cee210b8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 Jul 2007 04:20:15 +0000 Subject: For bug #185930, direct all FETCHCOMMAND output to stdout. svn path=/main/trunk/; revision=7330 --- pym/portage/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pym') 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({ -- cgit v1.2.3-1-g7c22