kadischi/livecd_generator kadischi.py,1.22,1.23

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	kadischi.py 
Log Message:
revert


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kadischi.py	4 Jul 2006 15:02:09 -0000	1.22
+++ kadischi.py	4 Jul 2006 15:12:02 -0000	1.23
@@ -22,7 +22,6 @@
 
 def main():
     force = False
-    method = None
     # setup dirs
     bindir = sys.path [0]
     confdir = normalize_path(['/etc/kadischi'])
@@ -108,7 +107,7 @@
     print "[kadischi]: running post installation scripts"
     run_scripts(sysdir)
 
-    ### Calculate size of result ISO image by known ratios for SquashFS (anywhere from 2.6 to 2.8)
+    ### Calculate size of result ISO image by known ratios for SquashFS (anywhere from 2.5 to 2.7)
     size = 0
     stepsize = 0
 
@@ -119,8 +118,8 @@
         stepsize = (size + stepsize)
 
     totalsize = stepsize
-    estimate0 = (totalsize / 2.6) ## Observed ratio for SquashFS
-    estimate1 = (totalsize / 2.8) ## Observed ratio for SquashFS
+    estimate0 = (totalsize / 2.5) ## Observed ratio for SquashFS
+    estimate1 = (totalsize / 2.7) ## Observed ratio for SquashFS
 
     print ("Estimated %s size is between %s and %s bytes" % (isoimage, estimate1, estimate0))
 
@@ -305,6 +304,7 @@
 def execute (args):
     if not os.access(args[0], os.X_OK):
         print "unable to access", args[0]
+-       cleanup(builddir)
     rc = subprocess.call(args)
     if rc:
         raise RuntimeError, "Failed to execute", args[0]
@@ -315,7 +315,7 @@
     try:
         rc = main()
     except KeyboardInterrupt, e:
-        print >> sys.stderr, "\n\nExiting on user cancel."
+        print >> sys.stderr, "\n\n[kadischi]:Exiting on user cancel."
         cleanup(builddir)
         sys.exit(1)
     except RuntimeError, e: