samba-tool: Use self.outf in a few more places.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu Oct 13 05:06:52 CEST 2011 on sn-devel-104

1 files changed, 10 insertions, 5 deletions

diff --git a/source4/scripting/python/samba/netcmd/group.py b/source4/scripting/python/samba/netcmd/group.py
index 90bee5f636..db2a6d6269 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/source4/scripting/python/samba/netcmd/group.py
@@ -80,8 +80,9 @@ class cmd_group_add(Command):
             samdb.newgroup(groupname, groupou=groupou, grouptype = gtype,
                           description=description, mailaddress=mail_address, notes=notes)
         except Exception, e:
+            # FIXME: catch more specific exception
             raise CommandError('Failed to create group "%s"' % groupname, e)
-        print("Added group %s" % groupname)
+        self.outf.write("Added group %s\n" % groupname)
 
 
 class cmd_group_delete(Command):
@@ -106,8 +107,9 @@ class cmd_group_delete(Command):
                           credentials=creds, lp=lp)
             samdb.deletegroup(groupname)
         except Exception, e:
+            # FIXME: catch more specific exception
             raise CommandError('Failed to remove group "%s"' % groupname, e)
-        print("Deleted group %s" % groupname)
+        self.outf.write("Deleted group %s\n" % groupname)
 
 
 class cmd_group_add_members(Command):
@@ -133,8 +135,10 @@ class cmd_group_add_members(Command):
                           credentials=creds, lp=lp)
             samdb.add_remove_group_members(groupname, listofmembers, add_members_operation=True)
         except Exception, e:
-            raise CommandError('Failed to add members "%s" to group "%s"' % (listofmembers, groupname), e)
-        print("Added members to group %s" % groupname)
+            # FIXME: catch more specific exception
+            raise CommandError('Failed to add members "%s" to group "%s"' % (
+                listofmembers, groupname), e)
+        self.outf.write("Added members to group %s\n" % groupname)
 
 
 class cmd_group_remove_members(Command):
@@ -160,8 +164,9 @@ class cmd_group_remove_members(Command):
                           credentials=creds, lp=lp)
             samdb.add_remove_group_members(groupname, listofmembers, add_members_operation=False)
         except Exception, e:
+            # FIXME: Catch more specific exception
             raise CommandError('Failed to remove members "%s" from group "%s"' % (listofmembers, groupname), e)
-        print("Removed members from group %s" % groupname)
+        self.outf.write("Removed members from group %s\n" % groupname)
 
 
 class cmd_group(SuperCommand):