HACKING: update for 0.27 release

[bup.git] / cmd / newliner-cmd.py

diff --git a/cmd/newliner-cmd.py b/cmd/newliner-cmd.py
index 966725e8fe8ac337e8bc00d70f240f6ae54bff1c..68d327b7ee6aaac273f522fcc23bd2c4d36c2ba6 100755 (executable)
--- a/cmd/newliner-cmd.py
+++ b/cmd/newliner-cmd.py
@@ -15,6 +15,7 @@ if extra:
 r = re.compile(r'([\r\n])')
 lastlen = 0
 all = ''
+width = options._tty_width() or 78
 while 1:
     l = r.split(all, 1)
     if len(l) <= 1:
@@ -32,6 +33,8 @@ while 1:
     else:
         assert(len(l) == 3)
         (line, splitchar, all) = l
+        if splitchar == '\r':
+            line = line[:width]
         sys.stdout.write('%-*s%s' % (lastlen, line, splitchar))
         if splitchar == '\r':
             lastlen = len(line)