Better exception text for DuplicateObject

svn path=/rpkid/rpki/xml_utils.py; revision=2704

1 files changed, 4 insertions, 2 deletions

diff --git a/rpkid/rpki/xml_utils.py b/rpkid/rpki/xml_utils.py
index fcf595ef..86459bac 100644
--- a/rpkid/rpki/xml_utils.py
+++ b/rpkid/rpki/xml_utils.py
@@ -303,8 +303,10 @@ class data_elt(base_elt):
       r_msg.append(r_pdu)
       cb()
 
-    if self.serve_fetch_one_maybe() is not None:
-      raise rpki.exceptions.DuplicateObject
+    oops = self.serve_fetch_one_maybe()
+    if oops is not None:
+      raise rpki.exceptions.DuplicateObject, "Object already exists: %r[%r] %r[%r]" % (self, getattr(self, self.element_name + "_handle"),
+                                                                                       oops, getattr(oops, oops.element_name + "_handle"))
 
     self.serve_pre_save_hook(self, r_pdu, one, eb)