|
 |
403b09 |
From 25b1fb956cc8029d5030d93cf48faed823778c5e Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Martin Babinsky <mbabinsk@redhat.com>
|
|
|
403b09 |
Date: Mon, 25 Jul 2016 14:05:08 +0200
|
|
|
403b09 |
Subject: [PATCH] baseldap: Fix MidairCollision instantiation during entry
|
|
|
403b09 |
modification
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6097
|
|
|
403b09 |
|
|
|
403b09 |
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
ipaserver/plugins/baseldap.py | 4 ++--
|
|
|
403b09 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py
|
|
|
403b09 |
index 6107e43a6ee17d9b9a63d9dc109664d8b232069f..f7844e3e7c59c259b9c8367d135b2dbefc3f0016 100644
|
|
|
403b09 |
--- a/ipaserver/plugins/baseldap.py
|
|
|
403b09 |
+++ b/ipaserver/plugins/baseldap.py
|
|
|
403b09 |
@@ -1466,7 +1466,7 @@ class LDAPUpdate(LDAPQuery, crud.Update):
|
|
|
403b09 |
entry_attrs.dn, attrs_list)
|
|
|
403b09 |
except errors.NotFound:
|
|
|
403b09 |
raise errors.MidairCollision(
|
|
|
403b09 |
- format=_('the entry was deleted while being modified')
|
|
|
403b09 |
+ message=_('the entry was deleted while being modified')
|
|
|
403b09 |
)
|
|
|
403b09 |
|
|
|
403b09 |
self.obj.get_indirect_members(entry_attrs, attrs_list)
|
|
|
403b09 |
@@ -2344,7 +2344,7 @@ class BaseLDAPModAttribute(LDAPQuery):
|
|
|
403b09 |
entry_attrs.dn, attrs_list)
|
|
|
403b09 |
except errors.NotFound:
|
|
|
403b09 |
raise errors.MidairCollision(
|
|
|
403b09 |
- format=_('the entry was deleted while being modified')
|
|
|
403b09 |
+ message=_('the entry was deleted while being modified')
|
|
|
403b09 |
)
|
|
|
403b09 |
|
|
|
403b09 |
for callback in self.get_callbacks('post'):
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|