From 472b320a17320f69450950763ff999267cddd080 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Tue, 13 Sep 2011 17:10:23 +0200 Subject: [PATCH] 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. --- source4/scripting/python/samba/samba3/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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] == ".": -- 2.34.1