From d346364544b0eea9f2687477103884caf3720c50 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Fri, 14 Oct 2011 11:39:03 +0200
Subject: [PATCH] better error message

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 lib/cdist/core/object.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/cdist/core/object.py b/lib/cdist/core/object.py
index c447f243..eeb5799b 100644
--- a/lib/cdist/core/object.py
+++ b/lib/cdist/core/object.py
@@ -34,11 +34,12 @@ DOT_CDIST = '.cdist'
 
 
 class IllegalObjectIdError(cdist.Error):
-    def __init__(self, object_id):
+    def __init__(self, object_id, message=None):
         self.object_id = object_id
+        self.message = message or 'Illegal object id'
 
     def __str__(self):
-        return 'Illegal object id: %s' % self.object_id
+        return '%s: %s' % (self.message, self.object_id)
 
 
 class Object(object):
@@ -88,7 +89,7 @@ class Object(object):
 
     def __init__(self, cdist_type, base_path, object_id=None):
         if object_id and object_id.startswith('/'):
-            raise IllegalObjectIdError(object_id)
+            raise IllegalObjectIdError(object_id, 'object_id may not start with /')
         self.type = cdist_type # instance of Type
         self.base_path = base_path
         self.object_id = object_id