kadischi/lib functions.py,1.10,1.11

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	functions.py 
Log Message:
Eliminate get_kernel_version(), use make_initrds() instead


Index: functions.py
===================================================================
RCS file: /cvs/devel/kadischi/lib/functions.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- functions.py	30 Jun 2006 23:03:46 -0000	1.10
+++ functions.py	4 Jul 2006 20:56:02 -0000	1.11
@@ -66,41 +66,6 @@
         clear_rpm_db_files (rootdir)
     return missing_rpms
 
-def get_kernel_version (rootdir):
-    kernel_version = None
-    clear_rpm_db_files (rootdir)
-    ts = rpm.TransactionSet (rootdir)
-    while kernel_version == None:
-        if isys.smpAvailable() or isys.htavailable():
-            for mi in ts.dbMatch ('name', 'kernel-xenU'):
-                kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xenU'
-                clear_rpm_db_files (rootdir)
-            for mi in ts.dbMatch ('name', 'kernel-xen0'):
-                kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0'
-                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'
-                clear_rpm_db_files (rootdir)
-            for mi in ts.dbMatch ('name', 'kernel-xen0'):
-                kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0'
-                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)
-                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"""