sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-28 11:42:03 +03:00
Code Activity

s4:python/samba/__init__.py - now specify the "relax" control for the delete operation before the provision

Browse Source
This commit is contained in:
Matthias Dieter Wallnöfer
2010-06-18 22:20:22 +02:00
parent c0538a006d
commit bce8017ca9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source4/scripting/python/samba/__init__.py
View File

@ -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