3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index dedab062..e1bd2e1d 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -206,7 +206,7 @@ class self_elt(data_elt):
 
   def serve_post_save_hook(self, q_pdu, r_pdu):
     if self.rekey or self.reissue or self.revoke or self.run_now or self.publish_world_now:
-      raise NotImplementedError
+      raise NotImplementedError, "Unimplemented control %s" % ", ".join(b for b in ("rekey", "reissue", "revoke", "run_now", "publish_world_now") if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
     """Handle <self/> element."""
@@ -333,7 +333,7 @@ class parent_elt(data_elt):
 
   def serve_post_save_hook(self, q_pdu, r_pdu):
     if self.rekey or self.reissue or self.revoke:
-      raise NotImplementedError
+      raise NotImplementedError, "Unimplemented control %s" % ", ".join(b for b in ("rekey", "reissue", "revoke") if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
     """Handle <parent/> element."""
@@ -399,7 +399,7 @@ class child_elt(data_elt):
 
   def serve_post_save_hook(self, q_pdu, r_pdu):
     if self.reissue:
-      raise NotImplementedError
+      raise NotImplementedError, "Unimplemented control %s" % ", ".join(b for b in ("reissue",) if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
     """Handle <child/> element."""
@@ -504,7 +504,7 @@ class route_origin_elt(data_elt):
 
   def serve_post_save_hook(self, q_pdu, r_pdu):
     if self.suppress_publication:
-      raise NotImplementedError
+      raise NotImplementedError, "Unimplemented control %s" % ", ".join(b for b in ("suppress_publication",) if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
     """Handle <route_origin/> element."""
diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py
index bb54d355..dcd1010a 100644
--- a/scripts/rpki/sql.py
+++ b/scripts/rpki/sql.py
@@ -199,14 +199,14 @@ class ca_obj(sql_persistant):
     need to create and set up a corresponding CA object.
     """
     self = cls()
-    raise NotImplementedError
+    raise NotImplementedError, "NIY"
 
   def delete(self, gctx):
     """Parent's list of current resource classes doesn't include the
     class corresponding to this CA, so we need to delete it (and its
     little dog too...).
     """
-    raise NotImplementedError
+    raise NotImplementedError, "NIY"
 
 class ca_detail_obj(sql_persistant):
   """Internal CA detail object."""
@@ -255,7 +255,7 @@ class ca_detail_obj(sql_persistant):
     - Resources changed, will need to frob any children affected by
       shrinkage.
     """
-    raise NotImplementedError
+    raise NotImplementedError, "NIY"
 
 class child_cert_obj(sql_persistant):
   """Certificate that has been issued to a child."""
diff --git a/scripts/rpkid.py b/scripts/rpkid.py
index efcb5d2d..0b629a6b 100755
--- a/scripts/rpkid.py
+++ b/scripts/rpkid.py
@@ -35,7 +35,7 @@ def up_down_handler(query, path):
     return 500, "Unhandled exception %s" % data
 
 def cronjob_handler(query, path):
-  raise NotImplementedError
+  raise NotImplementedError, "NIY"
 
 class global_context(object):
   """A place to stash various global parameters."""