[Fedora-livecd-list] imgcreate/live.py

Brian C. Lane bcl at fedoraproject.org
Thu Mar 28 23:32:33 UTC 2013


 imgcreate/live.py |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 5aa45aed7d9341749bbb68a41722661de881a8a5
Author: Brian C. Lane <bcl at redhat.com>
Date:   Thu Mar 28 16:26:37 2013 -0700

    Properly generate kernel stanzas (#928093)

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 11fa7fc..4fe1ea4 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -556,14 +556,8 @@ menu separator
         return template % args
 
     def __get_image_stanzas(self, isodir):
-        versions = []
         kernels = self._get_kernel_versions()
-        for kernel in kernels:
-            for version in kernels[kernel]:
-                versions.append(version)
-
         kernel_options = self._get_kernel_options()
-
         checkisomd5 = self._has_checkisomd5()
 
         # Stanzas for insertion into the config template
@@ -572,7 +566,7 @@ menu separator
         check = []
 
         index = "0"
-        for version in versions:
+        for kernel, version in ((k,v) for k in kernels for v in kernels[k]):
             (is_xen, isDracut) = self.__copy_kernel_and_initramfs(isodir, version, index)
             if index == "0":
                 self._isDracut = isDracut




More information about the livecd mailing list