From 39f266b434c1b5e8d4caab08a985fab8d083dfd5 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Wed, 24 Jan 2007 18:48:33 +0000
Subject: [PATCH] Use overrideCommand instead of registerCommand.

---
 pykickstart/commands/fc4.py | 10 +++++-----
 pykickstart/commands/fc5.py |  5 +++--
 pykickstart/commands/fc6.py | 12 ++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pykickstart/commands/fc4.py b/pykickstart/commands/fc4.py
index a814575..c160e64 100644
--- a/pykickstart/commands/fc4.py
+++ b/pykickstart/commands/fc4.py
@@ -392,8 +392,8 @@ class FC4Handler(FC3Handler):
         self.unregisterCommand(self.LiloCheck)
 
         self.registerCommand(self.Bootloader(), ["bootloader"])
-        self.registerCommand(self.LogVol(), ["logvol"])
-        self.registerCommand(self.MediaCheck(), ["mediacheck"])
-        self.registerCommand(self.Network(), ["network"])
-        self.registerCommand(self.Partition(), ["part", "partition"])
-        self.registerCommand(self.Raid(), ["raid"])
+        self.overrideCommand(self.LogVol())
+        self.overrideCommand(self.MediaCheck())
+        self.overrideCommand(self.Network())
+        self.overrideCommand(self.Partition())
+        self.overrideCommand(self.Raid())
diff --git a/pykickstart/commands/fc5.py b/pykickstart/commands/fc5.py
index 6308a97..03cec55 100644
--- a/pykickstart/commands/fc5.py
+++ b/pykickstart/commands/fc5.py
@@ -137,5 +137,6 @@ class FC5Handler(FC4Handler):
     def __init__(self):
         FC4Handler.__init__(self)
         self.version = FC5
-        self.registerCommand(self.LangSupport(), ["langsupport"])
-        self.registerCommand(self.Raid(), ["raid"])
+
+        self.overrideCommand(self.LangSupport())
+        self.overrideCommand(self.Raid())
diff --git a/pykickstart/commands/fc6.py b/pykickstart/commands/fc6.py
index 84fe6e4..eccc30d 100644
--- a/pykickstart/commands/fc6.py
+++ b/pykickstart/commands/fc6.py
@@ -762,13 +762,13 @@ class FC6Handler(FC5Handler):
         self.registerCommand(self.Iscsi(), ["iscsi"])
         self.registerCommand(self.IscsiName(), ["iscsiname"])
         self.registerCommand(self.Logging(), ["logging"])
-        self.registerCommand(self.Method(), ["cdrom", "harddrive", "nfs", "url"])
-        self.registerCommand(self.Monitor(), ["monitor"])
+        self.overrideCommand(self.Method())
+        self.overrideCommand(self.Monitor())
         self.registerCommand(self.MultiPath(), ["multipath"])
-        self.registerCommand(self.Network(), ["network"])
-        self.registerCommand(self.Reboot(), ["halt", "poweroff", "reboot", "shutdown"])
+        self.overrideCommand(self.Network())
+        self.overrideCommand(self.Reboot())
         self.registerCommand(self.Repo(), ["repo"])
         self.registerCommand(self.Services(), ["services"])
         self.registerCommand(self.User(), ["user"])
-        self.registerCommand(self.Vnc(), ["vnc"])
-        self.registerCommand(self.XConfig(), ["xconfig"])
+        self.overrideCommand(self.Vnc())
+        self.overrideCommand(self.XConfig())
-- 
2.11.4.GIT