Refactor exc_callback invocation.

Replace _call_exc_callbacks with a function wrapper, which will automatically
call exception callbacks when an exception is raised from the function. This
removes the need to specify the function and its arguments twice (once in the
function call itself and once in _call_exc_callbacks).

Add some extra checks to existing exception callbacks.

1 files changed, 4 insertions, 3 deletions

diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py
index 096cb9eae..13208542c 100644
--- a/ipalib/plugins/group.py
+++ b/ipalib/plugins/group.py
@@ -211,9 +211,10 @@ class group_mod(LDAPUpdate):
     def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs):
         # Check again for GID requirement in case someone tried to clear it
         # using --setattr.
-        if isinstance(exc, errors.ObjectclassViolation):
-            if 'gidNumber' in exc.message and 'posixGroup' in exc.message:
-                raise errors.RequirementError(name='gid')
+        if call_func.func_name == 'update_entry':
+            if isinstance(exc, errors.ObjectclassViolation):
+                if 'gidNumber' in exc.message and 'posixGroup' in exc.message:
+                    raise errors.RequirementError(name='gid')
         raise exc
 
 api.register(group_mod)