repo: add VFS resolve(); test resolve() via local and remote repos

[bup.git] / main.py

diff --git a/main.py b/main.py
index edb3ed88fa4196cafa26e81be957d08c634684fd..c0679e32919fa0a6b721ce70bd4eed8add70dcc4 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -5,13 +5,18 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 import errno, re, sys, os, subprocess, signal, getopt
 
-from fcntl import F_GETFL, F_SETFL
+if sys.version_info[0] != 2 \
+   and not os.environ.get('BUP_ALLOW_UNEXPECTED_PYTHON_VERSION') == 'true':
+    print('error: bup may crash with python versions other than 2, or eat your data',
+          file=sys.stderr)
+    sys.exit(2)
+
 from subprocess import PIPE
 from sys import stderr, stdout
-import fcntl, select
+import select
 
 argv = sys.argv
 exe = os.path.realpath(argv[0])
@@ -170,7 +175,8 @@ def print_clean_line(dest, content, width, sep=None):
     os.write(dest, content)
     if len(content) < width:
         os.write(dest, ' ' * (width - len(content)))
-    os.write(dest, sep)
+    if sep:
+        os.write(dest, sep)
 
 def filter_output(src_out, src_err, dest_out, dest_err):
     """Transfer data from src_out to dest_out and src_err to dest_err via
@@ -187,9 +193,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()