From 64e7e448fb476952a02c46a524f13586cea71fae Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Tue, 1 Nov 2011 15:16:53 -0400 Subject: [PATCH] samba-tool: Fix --quiet option in domain samba3upgrade --quiet option does not require an argument --- source4/scripting/python/samba/netcmd/domain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 715b376657c..8631d992d8b 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -548,7 +548,7 @@ class cmd_domain_samba3upgrade(Command): help="Path to samba3 testparm utility from the previous installation. This allows the default paths of the previous installation to be followed"), Option("--targetdir", type="string", metavar="DIR", help="Path prefix where the new Samba 4.0 AD domain should be initialised"), - Option("--quiet", help="Be quiet"), + Option("--quiet", help="Be quiet", action="store_true"), Option("--use-xattrs", type="choice", choices=["yes","no","auto"], metavar="[yes|no|auto]", help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto"), ] @@ -556,7 +556,7 @@ class cmd_domain_samba3upgrade(Command): takes_args = ["smbconf"] def run(self, smbconf=None, targetdir=None, dbdir=None, testparm=None, - quiet=None, use_xattrs=None, sambaopts=None, versionopts=None): + quiet=False, use_xattrs=None, sambaopts=None, versionopts=None): if not os.path.exists(smbconf): raise CommandError("File %s does not exist" % smbconf) -- 2.11.4.GIT