From 4d76761897bc60bab7796c0253a479c62664f196 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 30 Jul 2007 06:55:10 +0000 Subject: [PATCH] For bug #185930, direct all FETCHCOMMAND output to stdout. (branches/2.1.2 r7331) svn path=/main/branches/2.1.2.9/; revision=7503 --- pym/portage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index 8f1a16957..369e0bb4e 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2644,6 +2644,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({ -- 2.26.2