summaryrefslogtreecommitdiff
path: root/source4/setup/upgrade.py
diff options
context:
space:
mode:
Diffstat (limited to 'source4/setup/upgrade.py')
-rwxr-xr-xsource4/setup/upgrade.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py
index e5e6d2c832..96584a1026 100755
--- a/source4/setup/upgrade.py
+++ b/source4/setup/upgrade.py
@@ -6,7 +6,10 @@
#
import getopt
import optparse
-import samba.options
+import sys
+sys.path.append("scripting/python")
+import samba
+import samba.getopt
parser = optparse.OptionParser("upgrade [options]")
parser.add_option_group(options.SambaOptions(parser))
@@ -20,10 +23,12 @@ parser.add_option("--blank",
parser.add_option("--targetdir", type="string", metavar="DIR",
help="Set target directory")
+opts = parser.parse_args()[0]
+
def message(text):
"""Print a message if quiet is not set."""
- if opts.quiet:
- print text
+ if opts.quiet:
+ print text
message("Reading Samba3 databases and smb.conf\n")
samba3 = samba3_read(options.ARGV[0], options.ARGV[1])