From 99b38cfc8392dd1bf65418e51a449abe5a85373a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Apr 2008 21:58:31 +0000 Subject: Make file_get() redirect FETCHCOMMAND output to stdout just like portage.fetch() does. Thanks to Ramereth for reporting. (trunk r9844) svn path=/main/branches/2.1.2/; revision=9845 --- pym/getbinpkg.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py index d20a549ed..861e98dd8 100644 --- a/pym/getbinpkg.py +++ b/pym/getbinpkg.py @@ -398,7 +398,12 @@ def file_get(baseurl,dest,conn=None,fcmd=None): lexer = shlex.shlex(StringIO.StringIO(fcmd), posix=True) lexer.whitespace_split = True myfetch = [varexpand(x, mydict=variables) for x in lexer] - retval = spawn(myfetch, env=os.environ.copy()) + fd_pipes= { + 0:sys.stdin.fileno(), + 1:sys.stdout.fileno(), + 2:sys.stdout.fileno() + } + retval = spawn(myfetch, env=os.environ.copy(), fd_pipes=fd_pipes) if retval != os.EX_OK: sys.stderr.write("Fetcher exited with a failure condition.\n") return 0 -- cgit v1.2.3-1-g7c22