README: move test statuses to table listing all active branches

[bup.git] / main.py

diff --git a/main.py b/main.py
index 154c5dc393b8d7493d037e77aec2c29f69a55bdd..7f632beaa997f0a7dd6bbff8066f32f4b80dff96 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -5,9 +5,15 @@ 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
 
+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 select
@@ -169,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
@@ -197,16 +204,15 @@ def filter_output(src_out, src_err, dest_out, dest_err):
                     print_clean_line(dest, pending.pop(fd, []), width)
                 else:
                     split = sep_rx.split(buf)
-                    if len(split) > 2:
-                        while len(split) > 1:
-                            content, sep = split[:2]
-                            split = split[2:]
-                            print_clean_line(dest,
-                                             pending.pop(fd, []) + [content],
-                                             width,
-                                             sep)
-                    else:
-                        assert(len(split) == 1)
+                    while len(split) > 1:
+                        content, sep = split[:2]
+                        split = split[2:]
+                        print_clean_line(dest,
+                                         pending.pop(fd, []) + [content],
+                                         width,
+                                         sep)
+                    assert(len(split) == 1)
+                    if split[0]:
                         pending.setdefault(fd, []).extend(split)
     except BaseException as ex:
         pending_ex = chain_ex(add_ex_tb(ex), pending_ex)