kadischi/livecd_generator kadischi.py,1.13,1.14

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Fix logic block for kernel version processing.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kadischi.py	30 Jun 2006 23:03:46 -0000	1.13
+++ kadischi.py	1 Jul 2006 02:49:11 -0000	1.14
@@ -240,18 +240,23 @@
 # make initrd image
 # Borrow some more functions to do our logic
 flc_log ('making initrd image')
-kernel_smp = ("kernel-smp")
-kernel = ("kernel")
-has_kernel_smp = check_installed_rpms(sysdir, kernel_smp, False)
-has_kernel = check_installed_rpms(sysdir, kernel, False)
+kernel_smp = (['kernel-smp'])
+kernel = (['kernel'])
+has_no_kernel_smp = check_installed_rpms(sysdir, kernel_smp, False)
+has_no_kernel = check_installed_rpms(sysdir, kernel, False)
 
-if has_kernel and has_kernel_smp:
-    run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
-    run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version_smp), builddir)
-elif has_kernel_smp == 0 and has_kernel == -1:
+
+
+if has_no_kernel and has_no_kernel_smp:
+    flc_log('Couldnt determine the kernel versions, bailing!')
+    sys.exit(1)
+elif has_no_kernel and not has_no_kernel_smp:
     string.split(kernel_version, 'smp')
     string.join([kernel_version, 'smp'], '')
     run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
+elif not has_no_kernel and not has_no_kernel_smp:
+    run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
+    run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version_smp), builddir)
 else:
     run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)