diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-13 21:02:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-13 16:30:31 +0200 |
| commit | c6cf070df0add8484ffb16b40893327b36b6a936 (patch) | |
| tree | e411481e1305cb1c5bcab0a1ee0a49138214c1e1 /source4/scripting/python/samba/getopt.py | |
| parent | 4e87a8419ca662d35018f0d00c80f3d816473cbc (diff) | |
| download | samba-c6cf070df0add8484ffb16b40893327b36b6a936.tar.gz samba-c6cf070df0add8484ffb16b40893327b36b6a936.tar.xz samba-c6cf070df0add8484ffb16b40893327b36b6a936.zip | |
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 <abartlet@samba.org>
Autobuild-Date: Tue Sep 13 16:30:31 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4/scripting/python/samba/getopt.py')
| -rw-r--r-- | source4/scripting/python/samba/getopt.py | 2 |
1 files changed, 2 insertions, 0 deletions
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: |