summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>2010-04-12 16:05:37 +0300
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>2010-04-12 16:06:06 +0300
commit83312a9e501ebbee15b4fd2353330880496f4add (patch)
treec42b7ec7c3737299f2b1709260281613def8cdc0 /source4
parentd73a7e7e9063083f73fcce5170ea9b9682d66ef6 (diff)
downloadsamba-83312a9e501ebbee15b4fd2353330880496f4add.tar.gz
samba-83312a9e501ebbee15b4fd2353330880496f4add.tar.bz2
samba-83312a9e501ebbee15b4fd2353330880496f4add.zip
Fixed a problem with provision missing the default_dir/etc directory.
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2e4aa34a8c..f2004878c1 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1170,11 +1170,11 @@ def provision(setup_dir, message, session_info,
bind_gid = None
if targetdir is not None:
- if (not os.path.exists(os.path.join(targetdir, "etc"))):
- os.makedirs(os.path.join(targetdir, "etc"))
smbconf = os.path.join(targetdir, "etc", "smb.conf")
elif smbconf is None:
smbconf = param.default_path()
+ if not os.path.exists(os.path.dirname(smbconf)):
+ os.makedirs(os.path.dirname(smbconf))
# only install a new smb.conf if there isn't one there already
if os.path.exists(smbconf):