From c6cf070df0add8484ffb16b40893327b36b6a936 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 13 Sep 2011 21:02:43 +1000 Subject: s4-s3-upgrade Improve samba-tool domain samba3upgrade behaviour The --realm argument is again optional (the previous code would take the default from the default smb.conf, not the one specified) and --targetdir is now a named argument much like it is to provision. We now test the --testparm option to ensure it behaves the way we expect. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Tue Sep 13 16:30:31 CEST 2011 on sn-devel-104 --- source4/scripting/python/samba/getopt.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/scripting/python/samba/getopt.py') diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py index 0ab1e9e46f1..01e9f87e765 100644 --- a/source4/scripting/python/samba/getopt.py +++ b/source4/scripting/python/samba/getopt.py @@ -53,6 +53,7 @@ class SambaOptions(optparse.OptionGroup): callback=self._set_realm) self._configfile = None self._lp = LoadParm() + self.realm = None def get_loadparm_path(self): """Return path to the smb.conf file specified on the command line.""" @@ -66,6 +67,7 @@ class SambaOptions(optparse.OptionGroup): def _set_realm(self, option, opt_str, arg, parser): self._lp.set('realm', arg) + self.realm = arg def _set_option(self, option, opt_str, arg, parser): if arg.find('=') == -1: -- cgit