diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-07-30 06:55:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-30 06:55:10 +0000 |
| commit | 4d76761897bc60bab7796c0253a479c62664f196 (patch) | |
| tree | 61b8f9106124aba98181238e4ed45fecd4c0fbcd | |
| parent | For bug #162923, when digest verification of a distfile fails, rename instead... (diff) | |
| download | portage-multirepo-4d76761897bc60bab7796c0253a479c62664f196.tar.gz portage-multirepo-4d76761897bc60bab7796c0253a479c62664f196.tar.bz2 portage-multirepo-4d76761897bc60bab7796c0253a479c62664f196.zip | |
For bug #185930, direct all FETCHCOMMAND output to stdout. (branches/2.1.2 r7331)
svn path=/main/branches/2.1.2.9/; revision=7503
| -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 8f1a1695..369e0bb4 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({ |