diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-02-06 16:33:38 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-02-07 01:11:08 +0100 |
| commit | a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0 (patch) | |
| tree | f061638bef13c1f55a7444c7dfdf6d7c1995ec16 /source4/scripting/python/samba/netcmd/testparm.py | |
| parent | d6b47015037cbdebc3cd1c1f352cf7c6109bead3 (diff) | |
| download | samba-a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0.tar.gz samba-a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0.tar.xz samba-a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0.zip | |
Revert "samba-tool: moved takes_optiongroups definition to Command base class"
This reverts commit f6fa8684896b8f3f9f8b7bd3742c99906973274c.
This keeps the main command class fairly slim, and makes it a bit
more obvious where the arguments to run() are coming from.
Conflicts:
source4/scripting/python/samba/netcmd/__init__.py
source4/scripting/python/samba/netcmd/domain.py
source4/scripting/python/samba/netcmd/gpo.py
source4/scripting/python/samba/netcmd/newuser.py
source4/scripting/python/samba/netcmd/testparm.py
source4/scripting/python/samba/netcmd/user.py
source4/scripting/python/samba/tests/samba_tool/__init__.py
Diffstat (limited to 'source4/scripting/python/samba/netcmd/testparm.py')
| -rwxr-xr-x | source4/scripting/python/samba/netcmd/testparm.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/source4/scripting/python/samba/netcmd/testparm.py index 517196652b7..8b45c646d4d 100755 --- a/source4/scripting/python/samba/netcmd/testparm.py +++ b/source4/scripting/python/samba/netcmd/testparm.py @@ -4,7 +4,6 @@ # Unix SMB/CIFS implementation. # Test validity of smb.conf # Copyright (C) 2010-2011 Jelmer Vernooij <jelmer@samba.org> -# Copyright (C) Giampaolo Lauria 2011 <lauria2@yahoo.com> # # Based on the original in C: # Copyright (C) Karl Auer 1993, 1994-1998 @@ -51,6 +50,11 @@ class cmd_testparm(Command): "versionopts": options.VersionOptions } + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions + } + takes_options = [ Option("--section-name", type=str, help="Limit testparm to a named section"), |