IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 08:00:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make pkey always iterable when deleting

Browse Source
This commit is contained in:
Jakub Hrozek 2010-12-14 18:02:41 +01:00 committed by Rob Crittenden
parent 0e6962f710
commit 7aed107973
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipalib/plugins/baseldap.py
View File

@ -888,12 +888,14 @@ class LDAPDelete(LDAPMultiQuery):
return result
if not self.obj.primary_key or not isinstance(keys[-1], (list, tuple)):
keys = keys[:-1] + (keys[-1], )
pkeyiter = (keys[-1], )
else:
pkeyiter = keys[-1]
deleted = []
failed = []
result = True
for pkey in keys[-1]:
for pkey in pkeyiter:
try:
if not delete_entry(pkey):
result = False
@ -904,7 +906,7 @@ class LDAPDelete(LDAPMultiQuery):
else:
deleted.append(pkey)
if self.obj.primary_key and keys[-1] is not None:
if self.obj.primary_key and pkeyiter[0] is not None:
return dict(result=result, value=u','.join(deleted))
return dict(result=result, value=u'')