better exception handling for kickstart parser

diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py
index 1c7a8d4369ae750325afca7ddf3202bded84b588..4d11ccacb23ca190a458faf1b0ebd35f1a3cc829 100644 (file)
--- a/mic/kickstart/__init__.py
+++ b/mic/kickstart/__init__.py
@@ -66,12 +66,10 @@ def read_kickstart(path):
 
     try:
         ks.readKickstart(path)
-    except IOError, (err, msg):
-        raise errors.KsError("Failed to read kickstart file "
-                             "'%s' : %s" % (path, msg))
+    except kserrors.KickstartError, e:
+        raise errors.KsError("'%s': %s" % (path, str(e)))
     except kserrors.KickstartParseError, e:
-        raise errors.KsError("Failed to parse kickstart file "
-                             "'%s' : %s" % (path, e))
+        raise errors.KsError("'%s': %s" % (path, str(e)))
     return ks
 
 def build_name(kscfg, prefix = None, suffix = None, maxlen = None):