]> arthur.barton.de Git - bup.git/commitdiff
main: don't set stdio to nonblocking
authorRob Browning <rlb@defaultvalue.org>
Sat, 27 Jan 2018 21:19:24 +0000 (15:19 -0600)
committerRob Browning <rlb@defaultvalue.org>
Thu, 1 Feb 2018 07:08:29 +0000 (01:08 -0600)
This was left in the newliner replacement patch, and I can't remember
a justification for it.  Having it in there affects other processes,
so take it out.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
main.py

diff --git a/main.py b/main.py
index edb3ed88fa4196cafa26e81be957d08c634684fd..154c5dc393b8d7493d037e77aec2c29f69a55bdd 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -8,10 +8,9 @@ exec "$bup_python" "$0" ${1+"$@"}
 from __future__ import absolute_import
 import errno, re, sys, os, subprocess, signal, getopt
 
-from fcntl import F_GETFL, F_SETFL
 from subprocess import PIPE
 from sys import stderr, stdout
-import fcntl, select
+import select
 
 argv = sys.argv
 exe = os.path.realpath(argv[0])
@@ -187,9 +186,6 @@ def filter_output(src_out, src_err, dest_out, dest_err):
     pending_ex = None
     try:
         fds = tuple([x for x in (src_out, src_err) if x is not None])
-        for fd in fds:
-            flags = fcntl.fcntl(fd, F_GETFL)
-            assert fcntl.fcntl(fd, F_SETFL, flags | os.O_NONBLOCK) == 0
         while fds:
             ready_fds, _, _ = select.select(fds, [], [])
             width = tty_width()