kadischi/livecd_generator kadischi.py,1.61,1.62

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Minor fixes


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kadischi.py	24 Apr 2007 12:10:02 -0000	1.61
+++ kadischi.py	4 May 2007 10:50:40 -0000	1.62
@@ -23,7 +23,7 @@
 else:
     postscriptdir = "/usr/share/kadischi/post_install_scripts"
 
-version = "3.5"
+version = "3.6"
 
 def main():
     force = False
@@ -212,8 +212,13 @@
         # kadischi.sqsh is a file that we mount loopback. So we need to create supporting
         # files and directories outside of the compressed tree.
         os.makedirs (os.path.join(csysdir, 'boot/isolinux'))
-        touch = file(normalize_path([csysdir, '.livecd']), 'w')
-        touch.close()
+        stampfile = (builddir + '/.buildstamp')
+        if os.access(stampfile, os.R_OK):
+            shutil.copy(stampfile, csysdir + '/.livecd')
+        else:
+            shutil.copy("/etc/kadischi/buildstamp", csysdir + '/.livecd')
+        #touch = file(normalize_path([csysdir, '.livecd']), 'w')
+        #touch.close()
 
         # Make the SquashFS image
         ctree = normalize_path([csysdir, 'kadischi.sqsh'])
@@ -295,7 +300,7 @@
         choice = raw_input("[kadischi]: Would you like to burn the CD image now? [yes/no]: ")
         if choice == "yes":
             device = raw_input("[kadischi]: What device is your CDROM or DVDROM? [/dev/cdrom]: ")
-            if device == None:
+            if device == "":
                 device = "dev=/dev/cdrom"
             else:
                 device = string.join(["dev=", device], "")