2007-08-06 Jeremy Katz <katzj@redhat.com>

	* livecd.py (LiveCDCopyBackend.kernelVersionList): Check the rpmdb
	of the installed root (based on feedback from Jerry Vonau)
	* backend.py (AnacondaBackend.kernelVersionList): Take the
	rootPath as an argument
	* yuminstall.py (YumBackend.kernelVersionList): Likewise.

1 files changed, 10 insertions, 2 deletions

diff --git a/livecd.py b/livecd.py
index 5f977c117..6ccd2937e 100644
--- a/livecd.py
+++ b/livecd.py
@@ -325,13 +325,21 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
     def writeConfiguration(self):
         pass
 
-    def kernelVersionList(self):
+    def kernelVersionList(self, rootPath = "/"):
         versions = []
         
         # FIXME: we should understand more types of kernel versions and not
         # be tied to rpm...  
         import rpm
-        ts = rpm.TransactionSet()
+        ts = rpm.TransactionSet(rootPath)
+
+        # FIXME: and make sure that the rpmdb doesn't have stale locks :/
+        for rpmfile in ["__db.000", "__db.001", "__db.002", "__db.003"]:
+            try:
+                os.unlink("%s/var/lib/rpm/%s" %(rootPath, rpmfile))
+            except:
+                log.debug("failed to unlink /var/lib/rpm/%s" %(rpmfile,))
+                
         mi = ts.dbMatch('name', 'kernel')
         for h in mi:
             v = "%s-%s" %(h['version'], h['release'])