From 09ac7b442cabdee1812a81cfe995432fbd849165 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Wed, 24 Jan 2007 15:14:24 +0000
Subject: [PATCH] The key command was added for RHEL5, which was shortly after
 FC6 came out.

---
 pykickstart/commands/f7.py  | 27 +++++++++++++++++++++++++++
 pykickstart/commands/fc6.py | 23 -----------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/pykickstart/commands/f7.py b/pykickstart/commands/f7.py
index babb871..5716a0d 100644
--- a/pykickstart/commands/f7.py
+++ b/pykickstart/commands/f7.py
@@ -27,11 +27,38 @@ translate.textdomain("pykickstart")
 from fc6 import *
 
 class F7Handler(FC6Handler):
+    ###
+    ### COMMAND CLASSES
+    ###
+    class Key(KickstartCommand):
+        def __init__(self, writePriority=0, key=""):
+            KickstartCommand.__init__(self, writePriority)
+            self.key = key
+
+        def __str__(self):
+            if self.key == KS_INSTKEY_SKIP:
+                return "key --skip"
+            elif self.key != "":
+                return "key %s" % self.key
+            else:
+                return ""
+
+        def parse(self, args):
+            if len(args) > 1:
+                raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Command %s only takes one argument") % "key")
+
+            if args[0] == "--skip":
+                self.key = KS_INSTKEY_SKIP
+            else:
+                self.key = args[0]
+
     ##
     ## MAIN
     ##
     def __init__(self):
         FC6Handler.__init__(self)
         self.version = F7
+
         self.unregisterCommand(self.LangSupport)
         self.unregisterCommand(self.Mouse)
+        self.registerCommand(self.Key(), ["key"])
diff --git a/pykickstart/commands/fc6.py b/pykickstart/commands/fc6.py
index 39ef056..84fe6e4 100644
--- a/pykickstart/commands/fc6.py
+++ b/pykickstart/commands/fc6.py
@@ -299,28 +299,6 @@ class FC6Handler(FC5Handler):
                 raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Command %s only takes one argument") % "iscsiname")
             self.iscsiname = args[0]
 
-    class Key(KickstartCommand):
-        def __init__(self, writePriority=0, key=""):
-            KickstartCommand.__init__(self, writePriority)
-            self.key = key
-
-        def __str__(self):
-            if self.key == KS_INSTKEY_SKIP:
-                return "key --skip"
-            elif self.key != "":
-                return "key %s" % self.key
-            else:
-                return ""
-
-        def parse(self, args):
-            if len(args) > 1:
-                raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Command %s only takes one argument") % "key")
-
-            if args[0] == "--skip":
-                self.key = KS_INSTKEY_SKIP
-            else:
-                self.key = args[0]
-
     class Logging(KickstartCommand):
         def __init__(self, writePriority=0, host="", level="info", port=""):
             KickstartCommand.__init__(self, writePriority)
@@ -783,7 +761,6 @@ class FC6Handler(FC5Handler):
         self.registerCommand(self.DmRaid(), ["dmraid"])
         self.registerCommand(self.Iscsi(), ["iscsi"])
         self.registerCommand(self.IscsiName(), ["iscsiname"])
-        self.registerCommand(self.Key(), ["key"])
         self.registerCommand(self.Logging(), ["logging"])
         self.registerCommand(self.Method(), ["cdrom", "harddrive", "nfs", "url"])
         self.registerCommand(self.Monitor(), ["monitor"])
-- 
2.11.4.GIT