diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-21 04:21:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-21 04:21:17 +0000 |
| commit | b1324dbca64fb8553429124e1756d38508f0b858 (patch) | |
| tree | 9278ede48b19cdf8604ae1f6d8568447ce5f14c9 | |
| parent | 7ae2482576e7c9130737fb5ccb9d9137b4f24e8b (diff) | |
| download | portage-b1324dbca64fb8553429124e1756d38508f0b858.tar.gz portage-b1324dbca64fb8553429124e1756d38508f0b858.tar.bz2 portage-b1324dbca64fb8553429124e1756d38508f0b858.zip | |
For bug #185930, direct all FETCHCOMMAND output to stdout. (trunk r7330)
svn path=/main/branches/2.1.2/; revision=7331
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py index b7d938237..3de399cf4 100644 --- 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({ |