[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1056-g3dee92f

[Andrew Tridgell]

The branch, master has been updated
       via  3dee92fcb9af917da439e2c0cb10449d09d4c9ff (commit)
      from  7a79d161838efcec27a159fc40481e7be419b778 (commit)

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


- Log -----------------------------------------------------------------
commit 3dee92fcb9af917da439e2c0cb10449d09d4c9ff
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Aug 17 21:40:19 2009 +1000

    fixed the build
    
    the changes from Matthias didn't take account of url and lp being None
    in some ldb python instances in 'make test'

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

Summary of changes:
 source4/scripting/python/samba/__init__.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 5379530..59a6e00 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -98,11 +98,13 @@ class Ldb(ldb.Ldb):
         glue.ldb_set_utf8_casefold(self)
 
         # Allow admins to force non-sync ldb for all databases
-        nosync_p = lp.get("nosync", "ldb")
-        if nosync_p is not None and nosync_p == true:
+        if lp is not None:
+            nosync_p = lp.get("nosync", "ldb")
+            if nosync_p is not None and nosync_p == true:
                 flags |= FLG_NOSYNC
 
-        self.connect(url, flags, options)
+        if url is not None:
+            self.connect(url, flags, options)
 
     def set_credentials(self, credentials):
         glue.ldb_set_credentials(self, credentials)


-- 
Samba Shared Repository