summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-11 18:32:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-13 18:06:06 +0100
commitc529c12c7d644bb2d7391a5d736ee9e6b12d6ab6 (patch)
tree873aef1795621ac5f1cd915c0cb1f01ec12a452c
parent576ea40ece6adb156b4de23c737ada5e80b7946a (diff)
downloadsamba-c529c12c7d644bb2d7391a5d736ee9e6b12d6ab6.tar.gz
samba-c529c12c7d644bb2d7391a5d736ee9e6b12d6ab6.tar.bz2
samba-c529c12c7d644bb2d7391a5d736ee9e6b12d6ab6.zip
upgrade: use logger.warning.
-rw-r--r--source4/scripting/python/samba/netcmd/domain.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 871f72f952..35e9d29f2c 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -570,16 +570,16 @@ class cmd_domain_samba3upgrade(Command):
if not dbdir and not testparm:
raise CommandError("Please specify either dbdir or testparm")
- if dbdir and testparm:
- self.outf.write("warning: both dbdir and testparm specified, ignoring dbdir.\n")
- dbdir = None
-
logger = self.get_logger()
if quiet:
logger.setLevel(logging.WARNING)
else:
logger.setLevel(logging.INFO)
+ if dbdir and testparm:
+ logger.warning("both dbdir and testparm specified, ignoring dbdir.")
+ dbdir = None
+
lp = sambaopts.get_loadparm()
s3conf = s3param.get_context()