From 6c9b3b02a4578f9985b343e4d6f716a7b829b8f0 Mon Sep 17 00:00:00 2001
From: Ana Krivokapic <akrivoka@redhat.com>
Date: Mon, 23 Sep 2013 13:56:14 +0200
Subject: Fix error message when adding duplicate automember rule

Also fix object_name and object_name_plural for automember rules.

https://fedorahosted.org/freeipa/ticket/2708
---
 ipalib/plugins/baseldap.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ipalib/plugins/baseldap.py')

diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 503696eff..eab8d74e0 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -582,9 +582,10 @@ class LDAPObject(Object):
         )
 
     def handle_duplicate_entry(self, *keys):
-        pkey = ''
-        if self.primary_key:
+        try:
             pkey = keys[-1]
+        except KeyError:
+            pkey = ''
         raise errors.DuplicateEntry(
             message=self.already_exists_msg % {
                 'pkey': pkey, 'oname': self.object_name,
-- 
cgit