s4-scripting Rename passdb upgrade routine to avoid conflict with upgradeprovision

[amitay/samba.git] / source4 / setup / upgrade_from_s3

diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index 7f31a0f0e93f8e147520b84ade7dd9402b0d3c82..e3af2019e6f581f5ccf2b22bb94fa215afbe6412 100755 (executable)
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
 import optparse
 import os, sys
 
@@ -25,19 +26,14 @@ sys.path.insert(0, "bin/python")
 import samba
 import samba.getopt as options
 from samba.auth import system_session
-from samba.provision import find_setup_dir
-from samba.upgrade import upgrade_provision
+from samba.upgrade import upgrade_from_passdb
 from samba.samba3 import Samba3
-
 parser = optparse.OptionParser("upgrade_from_s3 [options] <libdir> <smbconf>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
-parser.add_option("--setupdir", type="string", metavar="DIR",
-                  help="directory with setup files")
-parser.add_option("--realm", type="string", metavar="REALM", help="set realm")
 parser.add_option("--quiet", help="Be quiet")
 parser.add_option("--blank",
                   help="do not add users or groups, just the structure")
@@ -46,16 +42,18 @@ parser.add_option("--targetdir", type="string", metavar="DIR",
 
 opts, args = parser.parse_args()
 
-def message(text):
-    """Print a message if quiet is not set."""
-    if not opts.quiet:
-        print text
+logger = logging.getLogger("upgrade")
+logger.addHandler(logging.StreamHandler(sys.stdout))
+if opts.quiet:
+       logger.setLevel(logging.WARNING)
+else:
+       logger.setLevel(logging.INFO)
 
 if len(args) < 1:
     parser.print_usage()
     sys.exit(1)
 
-message("Reading Samba3 databases and smb.conf")
+logger.info("Reading Samba3 databases and smb.conf")
 
 libdir = args[0]
 if not os.path.isdir(libdir):
@@ -69,16 +67,12 @@ else:
 
 samba3 = Samba3(libdir, smbconf)
 
-message("Provisioning")
-
-setup_dir = opts.setupdir
-if setup_dir is None:
-    setup_dir = find_setup_dir()
+logger.info("Provisioning")
 
 lp = sambaopts.get_loadparm()
 smbconf = lp.configfile
 creds = credopts.get_credentials(lp)
 
-upgrade_provision(samba3, setup_dir, message, credentials=creds,
-                  session_info=system_session(), smbconf=smbconf,
-                  targetdir=opts.targetdir)
+upgrade_from_passdb(samba3, logger, credentials=creds,
+                   session_info=system_session(), smbconf=smbconf,
+                   targetdir=opts.targetdir)