diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-09 03:09:56 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-09 03:09:56 +0100 |
| commit | bd0bfe683386f983318b507c5a614f818cdfb38d (patch) | |
| tree | 28aa616f000a8c9cb033e421929ee6574a8ae97d /source4/setup/provision.py | |
| parent | 2aac2a5df8a03a42ed92e84f093b8aa5ba16dd1d (diff) | |
| download | samba-bd0bfe683386f983318b507c5a614f818cdfb38d.tar.gz samba-bd0bfe683386f983318b507c5a614f818cdfb38d.tar.bz2 samba-bd0bfe683386f983318b507c5a614f818cdfb38d.zip | |
Fix provision python test.
(This used to be commit b173fa6bd2b24b5a3e7b4fbcb926f6c9771c10ba)
Diffstat (limited to 'source4/setup/provision.py')
| -rwxr-xr-x | source4/setup/provision.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source4/setup/provision.py b/source4/setup/provision.py index 9f887e8b3b..033d2491f2 100755 --- a/source4/setup/provision.py +++ b/source4/setup/provision.py @@ -26,9 +26,6 @@ import getopt import optparse import os, sys -# Add path to the library for in-tree use -sys.path.append("scripting/python") - import samba from auth import system_session @@ -130,12 +127,12 @@ lp.set("realm", opts.realm) lp.set("workgroup", opts.domain) lp.set("server role", opts.server_role or "domain controller") - if opts.aci is not None: print "set ACI: %s" % opts.aci -paths = provision_paths_from_lp(lp, opts.realm.lower(), private_dir) -paths.smbconf = sambaopts.get_loadparm_path() +paths = provision_paths_from_lp(lp, opts.realm.lower()) +if sambaopts.get_loadparm_path() is not None: + paths.smbconf = sambaopts.get_loadparm_path() creds = credopts.get_credentials() |