kadischi/livecd_generator kadischi.py,1.38,1.39

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Pull attributes form buildstamp file, instead of hardcoded values.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kadischi.py	11 Jul 2006 11:49:11 -0000	1.38
+++ kadischi.py	17 Aug 2006 15:43:50 -0000	1.39
@@ -15,7 +15,7 @@
 
 # variables related to building the image
 myname = "Kadischi Contributor"
-distname = "Fedora Core 5 Bordeaux (Live CD)"
+
 # Check for known postscriptdirs and set it accordingly.
 if os.path.isdir("/usr/local/share/kadischi/post_install_scripts"):
     postscriptdir = "/usr/local/share/kadischi/post_install_scripts"
@@ -78,6 +78,20 @@
     else:
         buildstamp = normalize_path ([confdir, 'buildstamp'])
 
+    # variables related to building the image
+    # Pulled in from buildstamp file
+    myname = "Kadischi Contributor"
+    if not os.access(buildstamp, os.R_OK):
+        print >> sys.stderr, "[kadischi]: Buildstamp file not readable or not found."
+        sys.exit(1)
+    else:
+        f = open(buildstamp, "r")
+        lines = f.readlines()
+        distname = lines[1][:-3]
+        distver = lines[2][:-2]
+        f.close()
+        dist = string.join([distname, distver], " ")
+
     # validating the repository
     print "[kadischi]: Trying to validate your repository"
     method = args [0]
@@ -173,7 +187,7 @@
     # create iso image
     print "[kadischi]: creating iso image %s" % isoimage
     args = ["/usr/bin/mkisofs", "-quiet", "-R",
-        "-V", distname,
+        "-V", dist,
         "-b", "boot/isolinux/isolinux.bin",
         "-c", "boot/isolinux/boot.cat",
         "-p", myname,