another taroon merge. tagged before as before-taroon-merge, after as

after-taroon-merge

this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.

1 files changed, 3 insertions, 6 deletions

diff --git a/text.py b/text.py
index 063d4d604..2d4da507b 100644
--- a/text.py
+++ b/text.py
@@ -86,11 +86,8 @@ if iutil.getArch() == 's390':
     stepToClasses["bootloader"] = ("zipl_text", ( "ZiplWindow"))
 
 class InstallWindow:
-    def __call__ (self, screen, todo):
-        if todo.doInstall ():
-            return INSTALL_BACK
-
-        return INSTALL_OK
+    def __call__ (self, screen):
+        raise RuntimeError, "Unimplemented screen"
 
 class WaitWindow:
     def pop(self):
@@ -198,7 +195,7 @@ class InstallInterface:
                                    buttons=[TEXT_OK_BUTTON])
                 return None
 
-	    l = f.readlines()
+	    lines = f.readlines()
             for l in lines:
                 l = l.replace("@RHL@", productName)
                 l = l.replace("@RHLVER@", productVersion)