Skip to content
Snippets Groups Projects
Commit 994510694b1d authored by Brodie Rao's avatar Brodie Rao
Browse files

pager: don't page stderr if it's being redirected (issue2541)

parent 2420cb1ea1d6
No related branches found
No related tags found
No related merge requests found
......@@ -59,10 +59,12 @@
def _runpager(p):
if not hasattr(os, 'fork'):
sys.stderr = sys.stdout = util.popen(p, 'wb')
sys.stdout = util.popen(p, 'wb')
if sys.stderr.isatty():
sys.stderr = sys.stdout
return
fdin, fdout = os.pipe()
pid = os.fork()
if pid == 0:
os.close(fdin)
os.dup2(fdout, sys.stdout.fileno())
......@@ -63,10 +65,11 @@
return
fdin, fdout = os.pipe()
pid = os.fork()
if pid == 0:
os.close(fdin)
os.dup2(fdout, sys.stdout.fileno())
os.dup2(fdout, sys.stderr.fileno())
if sys.stderr.isatty():
os.dup2(fdout, sys.stderr.fileno())
os.close(fdout)
return
os.dup2(fdin, sys.stdin.fileno())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment