diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-06-18 22:20:22 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-06-19 17:53:22 +0200 |
| commit | bce8017ca9f64ce8e3bf94312d69f97e87d3d41a (patch) | |
| tree | f19e8bd2ae34454bf41e23fdbb0662bf22afca3b | |
| parent | c0538a006d5381f3bc17d90f873e791d35bbde17 (diff) | |
| download | samba-bce8017ca9f64ce8e3bf94312d69f97e87d3d41a.tar.gz samba-bce8017ca9f64ce8e3bf94312d69f97e87d3d41a.tar.bz2 samba-bce8017ca9f64ce8e3bf94312d69f97e87d3d41a.zip | |
s4:python/samba/__init__.py - now specify the "relax" control for the delete operation before the provision
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index d870879a1e..ce408de049 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -147,7 +147,7 @@ class Ldb(_Ldb): try: for msg in res: - self.delete(msg.dn) + self.delete(msg.dn, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore no such object errors @@ -170,7 +170,7 @@ class Ldb(_Ldb): "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", [], controls=["show_deleted:0"]): try: - self.delete(msg.dn) + self.delete(msg.dn, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore no such object errors @@ -184,7 +184,7 @@ class Ldb(_Ldb): for attr in ["@SUBCLASSES", "@MODULES", "@OPTIONS", "@PARTITION", "@KLUDGEACL"]: try: - self.delete(attr) + self.delete(attr, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore missing dn errors @@ -198,7 +198,7 @@ class Ldb(_Ldb): # delete the specials for attr in ["@INDEXLIST", "@ATTRIBUTES"]: try: - self.delete(attr) + self.delete(attr, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore missing dn errors @@ -220,7 +220,7 @@ class Ldb(_Ldb): erase_recursive(self, msg.dn) try: - self.delete(dn) + self.delete(dn, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore no such object errors |