kadischi/livecd_generator kadischi.py,1.17,1.18

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27148/kadischi/livecd_generator

Modified Files:
	kadischi.py 
Log Message:
Fix anaconda_args checking


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kadischi.py	3 Jul 2006 18:48:30 -0000	1.17
+++ kadischi.py	3 Jul 2006 20:40:21 -0000	1.18
@@ -239,13 +239,19 @@
 estimate1 = (totalsize / 2.8) ## Observed ratio for SquashFS
 
 print ("Estimated %s size is between %s and %s bytes" % (isoimage, estimate1, estimate0))
-if anaconda_args.find("--kickstart") or anaconda_args.find("--cmdline") or anaconda_args.find("-C"):
-    print ("Continuing anyway, using kickstart or cmdline methods..")
-else:
-    print ("Press <enter> to continue, or ctrl-c to quit")
-    raw_input()
-
 
+for args in anaconda_args:
+    if not anaconda_args.find("--kickstart") or not anaconda_args.find("--cmdline") or not anaconda_args.find("-C"):
+        print ("Press <enter> to continue, or ctrl-c to quit")
+        try:
+            raw_input()
+        except:
+            flc_log("Cleaning builddir")
+            cleanup(builddir)
+            sys.exit(1)
+    else:
+        pass
+    
 
 # now`s the time to pickup kernel version cause when we move files arround, it will be late
 # Borrow some functions to do logic processing