upgrade: use logger.warning.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 11 Nov 2011 17:32:55 +0000 (18:32 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 13 Nov 2011 17:06:06 +0000 (18:06 +0100)
source4/scripting/python/samba/netcmd/domain.py

index 871f72f952bc54c9a594d6c57efc9faf25f02146..35e9d29f2c494f4d9f83897c3c36c515cb449370 100644 (file)
@@ -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()