Handle IOErrors if we can't find the kickstart file.

2 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d25581254..eabb11da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-30  Chris Lumens  <clumens@redhat.com>
+
+	* kickstart.py (processKickstartFile):  Handle IOErrors if we can't
+	find the kickstart file.
+
 2007-03-28  Jeremy Katz  <katzj@redhat.com>
 
 	* livecd.py (LiveCDCopyBackend.doRepoSetup): Check that we have
diff --git a/kickstart.py b/kickstart.py
index a4c4f9ec7..a3be191e2 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -817,12 +817,18 @@ def processKickstartFile(anaconda, file):
 
     try:
         ksparser.readKickstart(file)
+    except IOError, e:
+        if anaconda.intf:
+            anaconda.intf.kickstartErrorWindow("Could not open kickstart file or included file named %s" % e.filename)
+            sys.exit(0)
+        else:
+            raise
     except KickstartError, e:
        if anaconda.intf:
            anaconda.intf.kickstartErrorWindow(e.__str__())
            sys.exit(0)
        else:
-           raise KickstartError, e
+           raise
 
     # run %pre scripts
     runPreScripts(anaconda, ksparser.handler.scripts)
@@ -833,12 +839,18 @@ def processKickstartFile(anaconda, file):
 
     try:
         ksparser.readKickstart(file)
+    except IOError, e:
+        if anaconda.intf:
+            anaconda.intf.kickstartErrorWindow("Could not open kickstart file or included file named %s" % e.filename)
+            sys.exit(0)
+        else:
+            raise
     except KickstartError, e:
         if anaconda.intf:
             anaconda.intf.kickstartErrorWindow(e.__str__())
             sys.exit(0)
         else:
-            raise KickstartError, e
+            raise
 
     anaconda.id.setKsdata(handler)