From a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 6 Feb 2012 16:33:38 +0100 Subject: 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 --- source4/scripting/python/samba/netcmd/fsmo.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/scripting/python/samba/netcmd/fsmo.py') diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py index 4449a306a9a..958e5b8719b 100644 --- a/source4/scripting/python/samba/netcmd/fsmo.py +++ b/source4/scripting/python/samba/netcmd/fsmo.py @@ -4,7 +4,6 @@ # # Copyright Nadezhda Ivanova 2009 # Copyright Jelmer Vernooij 2009 -# Copyright Giampaolo Lauria 2011 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,6 +38,12 @@ class cmd_fsmo_seize(Command): synopsis = "%prog [options]" + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "credopts": options.CredentialsOptions, + "versionopts": options.VersionOptions, + } + takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), -- cgit