samba-tool: Fix typo in --help output.

[metze/samba/wip.git] / source4 / scripting / python / samba / netcmd / testparm.py

diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/source4/scripting/python/samba/netcmd/testparm.py
index a6639a3d045c33ce6d57d44bf92f2d1da23a017b..34c8fa50fcb6afb17e204f235929511d76535903 100644 (file)
--- a/source4/scripting/python/samba/netcmd/testparm.py
+++ b/source4/scripting/python/samba/netcmd/testparm.py
@@ -42,11 +42,6 @@ class cmd_testparm(Command):
 
     synopsis = "%prog [options]"
 
-    takes_optiongroups = {
-        "sambaopts" : options.SambaOptions,
-        "versionopts": options.VersionOptions
-    }
-
     takes_optiongroups = {
         "sambaopts": options.SambaOptions,
         "versionopts": options.VersionOptions
@@ -67,7 +62,7 @@ class cmd_testparm(Command):
         Option("-v", "--verbose", action="store_true",
                default=False, help="Show default options too"),
         # We need support for smb.conf macros before this will work again
-        Option("--server", type=str, help="Set %%L macro to servername"),
+        Option("--server", type=str, help="Set %L macro to servername"),
         # These are harder to do with the new code structure
         Option("--show-all-parameters", action="store_true", default=False,
                help="Show the parameters, type, possible values")
@@ -75,11 +70,10 @@ class cmd_testparm(Command):
 
     takes_args = []
 
-    def run(self, sambaopts, versionopts, 
-            section_name=None, parameter_name=None,
-            client_ip=None, client_name=None, verbose=False,
-            suppress_prompt=None,
-            show_all_parameters=False, server=None):
+    def run(self, sambaopts, versionopts, section_name=None,
+            parameter_name=None, client_ip=None, client_name=None,
+            verbose=False, suppress_prompt=None, show_all_parameters=False,
+            server=None):
         if server:
             raise NotImplementedError("--server not yet implemented")
         if show_all_parameters:
@@ -105,7 +99,8 @@ class cmd_testparm(Command):
         else:
             if section_name is not None or parameter_name is not None:
                 if parameter_name is None:
-                    lp[section_name].dump(sys.stdout, lp.default_service, verbose)
+                    lp[section_name].dump(sys.stdout, lp.default_service,
+                            verbose)
                 else:
                     self.outf.write(lp.get(parameter_name, section_name)+"\n")
             else:
@@ -153,8 +148,9 @@ class cmd_testparm(Command):
             valid = False
 
         if winbind_separator == '+':
-            logger.error("'winbind separator = +' might cause problems with group "
-                         "membership.")
+            logger.error(
+                "'winbind separator = +' might cause problems with group "
+                "membership.")
             valid = False
 
         return valid
@@ -166,7 +162,8 @@ class cmd_testparm(Command):
         valid = True
         for s in lp.services():
             if len(s) > 12:
-                logger.warning("You have some share names that are longer than 12 "
+                logger.warning(
+                    "You have some share names that are longer than 12 "
                     "characters. These may not be accessible to some older "
                     "clients. (Eg. Windows9x, WindowsMe, and not listed in "
                     "smbclient in Samba 3.0.)")