From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Tue, 13 Sep 2011 15:10:23 +0000 (+0200)
Subject: s4:upgrade_from_s3 - old s3 versions (3.0.x) don't have a distinct state directory
X-Git-Url: http://git.samba.org/samba.git/?p=mdw%2Fsamba.git;a=commitdiff_plain;h=472b320a17320f69450950763ff999267cddd080

s4:upgrade_from_s3 - old s3 versions (3.0.x) don't have a distinct state directory

Hence the "lock directory" path has to be used instead.
---

diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py
index dd2f927aa4..cdac071b5b 100644
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/source4/scripting/python/samba/samba3/__init__.py
@@ -373,7 +373,10 @@ class Samba3(object):
     def statedir_path(self, path):
         if path[0] == "/" or path[0] == ".":
             return path
-        return os.path.join(self.lp.get("state directory"), path)
+        elif self.lp.get("state directory"):
+            return os.path.join(self.lp.get("state directory"), path)
+        else:
+            return os.path.join(self.lp.get("lock directory"), path)
 
     def privatedir_path(self, path):
         if path[0] == "/" or path[0] == ".":