[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  83312a9... Fixed a problem with provision missing the default_dir/etc directory.
      from  d73a7e7... s3: Little refactoring: Factor out skip_space

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 83312a9e501ebbee15b4fd2353330880496f4add
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Mon Apr 12 16:05:37 2010 +0300

    Fixed a problem with provision missing the default_dir/etc directory.

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/provision.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2e4aa34..f200487 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):


-- 
Samba Shared Repository