[Fedora-livecd-list] 2 commits - imgcreate/kickstart.py livecd-tools.spec

[Jeremy Katz]

 imgcreate/kickstart.py |    3 ++-
 livecd-tools.spec      |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b8087f6e52deb6ff3d2c3d445fc82cdbf9e85c39
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Oct 8 09:17:11 2008 -0400

    Don't lazily import rhpl.keyboard
    
    Lazily importing rhpl.keyboard can have some odd chroot impacts, so stop
    doing so and also be sure that we explicitly require rhpl

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 278ac72..d911925 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -23,6 +23,8 @@ import subprocess
 import time
 import logging
 
+import rhpl.keyboard
+
 import pykickstart.commands as kscommands
 import pykickstart.constants as ksconstants
 import pykickstart.errors as kserrors
@@ -133,7 +135,6 @@ class KeyboardConfig(KickstartConfig):
         #   should this impact the X keyboard config too?
         #   or do we want to make X be able to do this mapping?
         #
-        import rhpl.keyboard
         k = rhpl.keyboard.Keyboard()
         if kskeyboard.keyboard:
             k.set(kskeyboard.keyboard)
diff --git a/livecd-tools.spec b/livecd-tools.spec
index c08e2dd..2df16df 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -20,6 +20,7 @@ Requires: squashfs-tools
 Requires: pykickstart >= 0.96
 Requires: dosfstools >= 2.11-8
 Requires: isomd5sum
+Requires: rhpl
 %ifarch %{ix86} x86_64
 Requires: syslinux
 %endif


commit 86577e6c20e6ff4347530682955b7c898e6b9545
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Oct 8 09:16:54 2008 -0400

    Bump yum version for new API usage

diff --git a/livecd-tools.spec b/livecd-tools.spec
index ab641b8..c08e2dd 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: util-linux
 Requires: coreutils
 Requires: e2fsprogs
-Requires: yum >= 3.1.7
+Requires: yum >= 3.2.18
 Requires: mkisofs
 Requires: squashfs-tools
 Requires: pykickstart >= 0.96