kadischi/livecd_generator kadischi.py,1.28,1.29

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Wed Jul 5 02:28:57 UTC 2006


Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Minor fixes since rewrites


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kadischi.py	4 Jul 2006 20:56:07 -0000	1.28
+++ kadischi.py	5 Jul 2006 02:28:55 -0000	1.29
@@ -124,7 +124,7 @@
     print ("[kadischi]: estimated %s size is between %s and %s bytes" % (isoimage, estimate1, estimate0))
 
     # make initrd image and pickup kernel version cause when we move files arround, it will be late
-    print "[kadischi]: making initrd image"
+    print ("[kadischi]: making initrd image")
     make_initrds(sysdir, bindir)
 
     # move files
@@ -290,43 +290,33 @@
     kernel = None
     kernel_smp = None
     if isys.smpAvailable() or isys.htavailable():
-        for mi in ts.dbMatch():
-            if mi in ts.dbMatch('name', 'kernel'):
-                kernel = "%s-%s" % (mi['version'], mi['release'])
-            if mi in ts.dbMatch('name', 'kernel-smp'):
-                kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'
-
-        if kernel != None and kernel_smp != None:
+        for mi in ts.dbMatch('name', 'kernel'):
             kernel = "%s-%s" % (mi['version'], mi['release'])
+        for mi in ts.dbMatch('name', 'kernel-smp'):
             kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'
+
+        if kernel != None and kernel_smp != None:
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel_smp))
         elif kernel != None and kernel_smp == None:
-            kernel = "%s-%s" % (mi['version'], mi['release'])
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
         elif kernel == None and kernel_smp != None:
-            kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel_smp))
         else:
             print >> sys.stderr, "\n\nCouldn't determine kernel version!"
             sys.exit(1)
     else:
-        for mi in ts.dbMatch():
-            if mi in ts.dbMatch('name', 'kernel'):
-                kernel = "%s-%s" % (mi['version'], mi['release'])
-            for mi in ts.dbMatch('name', 'kernel-smp'):
-                kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'
-
-        if kernel != None and kernel_smp != None:
+        for mi in ts.dbMatch('name', 'kernel'):
             kernel = "%s-%s" % (mi['version'], mi['release'])
+        for mi in ts.dbMatch('name', 'kernel-smp'):
             kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'
+
+        if kernel != None and kernel_smp != None:
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel_smp))
         elif kernel != None and kernel_smp == None:
-            kernel = "%s-%s" % (mi['version'], mi['release'])
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
         elif kernel == None and kernel_smp != None:
-            kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel_smp))
         else:
             print >> sys.stderr, "\n\nCouldn't determine kernel version!"




More information about the fedora-extras-commits mailing list