From: Varsha Rao <varao@redhat.com>
Date: Fri, 5 Jul 2019 16:28:58 +0000 (+0530)
Subject: cephfs-shell: Fix TypeError in poutput()
X-Git-Tag: v14.2.3~72^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd504d05a16d15ee45ece4c9fddebe1c88a812ef;p=ceph.git

cephfs-shell: Fix TypeError in poutput()

Fixes: https://tracker.ceph.com/issues/40679
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 19f7213f12ee42a4d4c059c044e3dbd514559639)
---

diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/cephfs-shell
index 05e1fa44773d..4cad546f55ff 100644
--- a/src/tools/cephfs/cephfs-shell
+++ b/src/tools/cephfs/cephfs-shell
@@ -55,7 +55,7 @@ shell = None
 
 
 def poutput(s, end='\n'):
-    shell.poutput(s, end)
+    shell.poutput(s, end=end)
 
 
 def setup_cephfs(config_file):
@@ -725,12 +725,12 @@ exists.')
                 if dirs:
                     paths.extend(dirs)
                 else:
-                    self.poutput(path, ':\n')
+                    self.poutput(path, end=':\n')
                 items = sorted(items, key=lambda item: item.d_name)
             else:
                 if path != '' and path != cephfs.getcwd().decode(
                         'utf-8') and len(paths) > 1:
-                    self.poutput(path, ':\n')
+                    self.poutput(path, end=':\n')
                 items = sorted(ls(path),
                                key=lambda item: item.d_name)
             if not args.all:
@@ -769,7 +769,7 @@ exists.')
             if not args.long:
                 print_list(values, shutil.get_terminal_size().columns)
                 if path != paths[-1]:
-                    self.poutput('\n')
+                    self.poutput('')
 
     def complete_rmdir(self, text, line, begidx, endidx):
         """