kadischi/lib functions.py,1.9,1.10

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	functions.py 
Log Message:
Support multiple combinations of possible user installed kernels. UP, SMP, UP & SMP, Xen0, Xen0 & XenU


Index: functions.py
===================================================================
RCS file: /cvs/devel/kadischi/lib/functions.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- functions.py	20 Jun 2006 20:30:01 -0000	1.9
+++ functions.py	30 Jun 2006 23:03:46 -0000	1.10
@@ -78,13 +78,14 @@
             for mi in ts.dbMatch ('name', 'kernel-xen0'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0'
                 clear_rpm_db_files (rootdir)
-            for mi in ts.dbMatch ('name', 'kernel-smp'):
-                kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
-                clear_rpm_db_files (rootdir)
             if kernel_version == None:
                 for mi in ts.dbMatch ('name', 'kernel'):
                     kernel_version = "%s-%s" % (mi['version'], mi['release'])
                     clear_rpm_db_files (rootdir)
+                for mi in ts.dbMatch ('name', 'kernel-smp'):
+                    kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
+                    clear_rpm_db_files (rootdir) 
+           
         else:
             for mi in ts.dbMatch ('name', 'kernel-xenU'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xenU'
@@ -92,14 +93,14 @@
             for mi in ts.dbMatch ('name', 'kernel-xen0'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0'
                 clear_rpm_db_files (rootdir)
-            for mi in ts.dbMatch ('name', 'kernel'):
-                kernel_version = "%s-%s" % (mi['version'], mi['release'])
-                clear_rpm_db_files (rootdir)
             if kernel_version == None:
                 for mi in ts.dbMatch ('name', 'kernel-smp'):
                     kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
                     clear_rpm_db_files (rootdir)
-    return kernel_version
+                for mi in ts.dbMatch ('name', 'kernel'):
+                    kernel_version = "%s-%s" % (mi['version'], mi['release'])
+                    clear_rpm_db_files (rootdir)
+        return kernel_version
 
 def clean_directory (dir, remove_when_done=True, keep_child_directories=False):
     """Removes all files in a directory, optionally removing the directory afterwards"""