samba-tool processes: Make the output a bit neater
authorRicky Nance <ricky.nance@weaubleau.k12.mo.us>
Sat, 8 Dec 2012 00:43:16 +0000 (18:43 -0600)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 8 Dec 2012 02:34:29 +0000 (03:34 +0100)
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Sat Dec  8 03:34:29 CET 2012 on sn-devel-104

source4/scripting/python/samba/netcmd/processes.py

index 751ab94c21fdc2af29b262448326938e447b1ae8..b25a2e453ec4376e2a05afa94bec50bb9eb350ba 100644 (file)
@@ -62,17 +62,17 @@ class cmd_processes(Command):
         if name is not None:
             ids = msg_ctx.irpc_servers_byname(name)
             for server_id in ids:
-                print "%d\n" % server_id.pid
+                self.outf.write("%d\n" % server_id.pid)
         elif pid is not None:
             names = msg_ctx.irpc_all_servers()
             for name in names:
                 for server_id in name.ids:
                     if server_id.pid == int(pid):
-                        print "%s\n" % name.name
+                        self.outf.write("%s\n" % name.name)
         else:
             names = msg_ctx.irpc_all_servers()
+            self.outf.write(" Service:                PID \n")
+            self.outf.write("-----------------------------\n")
             for name in names:
-                print "%s: " % name.name
                 for server_id in name.ids:
-                    print "%d " % server_id.pid
-                print "\n"
+                    self.outf.write("%-16s      %6d\n" % (name.name, server_id.pid))