From ce1aaa9dfa95625f1b5d98a988a54d7d051ff2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Fri, 16 Oct 2015 11:19:27 -0400
Subject: [PATCH] Revert "fix conflict between --stats and --progress"

the columns handling fixed that isssue more elegantly

This reverts commit 7f777784194b2625272a368c85c0712eb01df2fb.

Conflicts:
	borg/helpers.py
---
 borg/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/borg/helpers.py b/borg/helpers.py
index a60776e12..a08bbef19 100644
--- a/borg/helpers.py
+++ b/borg/helpers.py
@@ -196,7 +196,7 @@ def show_progress(self, item=None, final=False, stream=None):
             msg += "{0:<{space}}".format(path, space=space)
         else:
             msg = ' ' * columns
-        print(msg, file=stream or sys.stderr, end=final and "\n" or "\r")
+        print(msg, file=stream or sys.stderr, end="\r")
 
 
 def get_keys_dir():