From 0be941a3839c26b5fe7d6a0bc5315958bab45410 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 11 May 2008 14:32:06 +0200 Subject: Remove python extension from upgrade script. (This used to be commit 5268649b7ef60a2caae9cdf66dfeaf6d2037aba3) --- source4/selftest/samba4_tests.sh | 2 +- source4/setup/upgrade | 65 ++++++++++++++++++++++++++++++++++++++++ source4/setup/upgrade.py | 65 ---------------------------------------- 3 files changed, 66 insertions(+), 66 deletions(-) create mode 100755 source4/setup/upgrade delete mode 100755 source4/setup/upgrade.py (limited to 'source4') diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 725fde2c7d..9c7e93906c 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -351,7 +351,7 @@ plantest "winreg.python" dc $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcer plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3 rm -rf $PREFIX/upgrade -plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf +plantest "blackbox.upgrade" none $PYTHON setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf rm -rf $PREFIX/provision mkdir $PREFIX/provision plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" "$CONFIGURATION" diff --git a/source4/setup/upgrade b/source4/setup/upgrade new file mode 100755 index 0000000000..3bcc57ab64 --- /dev/null +++ b/source4/setup/upgrade @@ -0,0 +1,65 @@ +#!/usr/bin/python +# +# Upgrade from Samba3 +# Copyright Jelmer Vernooij 2005-2007 +# Released under the GNU GPL v3 or later +# +import getopt +import optparse +import os, sys +import param +import samba +import samba.getopt as options +from auth import system_session + +parser = optparse.OptionParser("upgrade [options] ") +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") +parser.add_option("--targetdir", type="string", metavar="DIR", + help="Set target directory") + +opts, args = parser.parse_args() + +def message(text): + """Print a message if quiet is not set.""" + if opts.quiet: + print text + +if len(args) < 1: + parser.print_usage() + sys.exit(1) +from samba.samba3 import Samba3 +message("Reading Samba3 databases and smb.conf\n") +libdir = args[0] +if not os.path.isdir(libdir): + print "error: %s is not a directory" + sys.exit(1) +if len(args) > 1: + smbconf = args[1] +else: + smbconf = os.path.join(libdir, "smb.conf") +samba3 = Samba3(libdir, smbconf) + +from samba.upgrade import upgrade_provision + +message("Provisioning\n") + +setup_dir = opts.setupdir +if setup_dir is None: + setup_dir = "setup" + +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) diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py deleted file mode 100755 index 3bcc57ab64..0000000000 --- a/source4/setup/upgrade.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/python -# -# Upgrade from Samba3 -# Copyright Jelmer Vernooij 2005-2007 -# Released under the GNU GPL v3 or later -# -import getopt -import optparse -import os, sys -import param -import samba -import samba.getopt as options -from auth import system_session - -parser = optparse.OptionParser("upgrade [options] ") -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") -parser.add_option("--targetdir", type="string", metavar="DIR", - help="Set target directory") - -opts, args = parser.parse_args() - -def message(text): - """Print a message if quiet is not set.""" - if opts.quiet: - print text - -if len(args) < 1: - parser.print_usage() - sys.exit(1) -from samba.samba3 import Samba3 -message("Reading Samba3 databases and smb.conf\n") -libdir = args[0] -if not os.path.isdir(libdir): - print "error: %s is not a directory" - sys.exit(1) -if len(args) > 1: - smbconf = args[1] -else: - smbconf = os.path.join(libdir, "smb.conf") -samba3 = Samba3(libdir, smbconf) - -from samba.upgrade import upgrade_provision - -message("Provisioning\n") - -setup_dir = opts.setupdir -if setup_dir is None: - setup_dir = "setup" - -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) -- cgit