diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 20:00:32 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 20:00:32 +0200 |
| commit | 18f8f5d6561d50b9179541ea24e03a5a807a2a2a (patch) | |
| tree | 4759b1bc65e703213178d7ab4ef7c1a80e713161 /source4/scripting/python/samba/getopt.py | |
| parent | a15b6f1606e1c761c2c4037b734137e97f00489f (diff) | |
| parent | 68a2c547d00d7a8d0c15744172489d9d010c31a3 (diff) | |
| download | samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.tar.gz samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.tar.xz samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)
Diffstat (limited to 'source4/scripting/python/samba/getopt.py')
| -rw-r--r-- | source4/scripting/python/samba/getopt.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py index 82cb004b62..7ec684a9d6 100644 --- a/source4/scripting/python/samba/getopt.py +++ b/source4/scripting/python/samba/getopt.py @@ -35,12 +35,14 @@ class SambaOptions(optparse.OptionGroup): self._configfile = arg def get_loadparm(self): - import param + import os, param lp = param.LoadParm() - if self._configfile is None: - lp.load_default() - else: + if self._configfile is not None: lp.load(self._configfile) + elif os.getenv("SMB_CONF_PATH") is not None: + lp.load(os.getenv("SMB_CONF_PATH")) + else: + lp.load_default() return lp class VersionOptions(optparse.OptionGroup): |