Check the conflicting commands automatically

If the command, that is going to be parsed, defines any conflicting commands,
the kickstart handler will check them first and raise an exception if there
is a conflict. This happens automatically now.

(cherry picked from commit cfcc525)
Related: RHEL-17662

pykickstart/base.py

@@ -189,14 +189,6 @@ def _setToObj(self, namespace, obj):
         warnings.warn("_setToObj has been renamed to set_to_obj.  The old name will be removed in a future release.", PendingDeprecationWarning, stacklevel=2)
         self.set_to_obj(namespace, obj)
 
-    # Check for conflicting commands and raise an error
-    def _checkConflictingCommands(self, msg):
-        for cmd in self.conflictingCommands:
-            if not hasattr(self.handler, cmd) or not getattr(self.handler, cmd).seen:
-                continue
-
-            raise KickstartParseError(msg % cmd, lineno=self.lineno)
-
 
 class DeprecatedCommand(KickstartCommand):
     """Specify that a command is deprecated and no longer has any function.
@@ -429,6 +421,10 @@ def dispatcher(self, args, lineno):
             self.commands[cmd].lineno = lineno
             self.commands[cmd].seen = True
 
+            # Check for conflicting commands.
+            conflicting_cmds = self.commands[cmd].conflictingCommands
+            self._checkConflictingCommands(cmd, conflicting_cmds, lineno=lineno)
+
             # The parser returns the data object that was modified.  This is either
             # the command handler object itself (a KickstartCommand object), or it's
             # a BaseData subclass instance that should be put into the command's
@@ -444,6 +440,23 @@ def dispatcher(self, args, lineno):
 
             return obj
 
+    def _checkConflictingCommands(self, cmd, conflicting_cmds, lineno=None):
+        """Check for conflicting commands and raise an error."""
+        for conflicting_cmd in conflicting_cmds:
+            if conflicting_cmd not in self.commands:
+                continue
+
+            if self.commands[conflicting_cmd] is None:
+                continue
+
+            if not self.commands[conflicting_cmd].seen:
+                continue
+
+            raise KickstartParseError(
+                _("The %s and %s commands can't be used at the same time.")
+                % (cmd, conflicting_cmd), lineno=lineno
+            )
+
 
 class BaseHandler(KickstartHandler):
     """A base kickstart handler.

pykickstart/commands/autopart.py

@@ -181,17 +181,6 @@ def _getParser(self):
                         filesystem.""")
         return op
 
-    def parse(self, args):
-        # call the overriden command to do its job first
-        retval = F12_AutoPart.parse(self, args)
-
-        # Using autopart together with other partitioning command such as
-        # part/partition, raid, logvol or volgroup can lead to hard to debug
-        # behavior that might among other result into an unbootable system.
-        self._checkConflictingCommands(_("The %s and autopart commands can't be used at the same time"))
-        return retval
-
-
 class F16_AutoPart(F12_AutoPart):
     removedKeywords = F12_AutoPart.removedKeywords
     removedAttrs = F12_AutoPart.removedAttrs
@@ -317,16 +306,6 @@ def __init__(self, writePriority=100, *args, **kwargs):
         F18_AutoPart.__init__(self, writePriority=writePriority, *args, **kwargs)
         self.typeMap["thinp"] = AUTOPART_TYPE_LVM_THINP
 
-    def parse(self, args):
-        # call the overriden command to do its job first
-        retval = F18_AutoPart.parse(self, args)
-
-        # Using autopart together with other partitioning command such as
-        # part/partition, raid, logvol or volgroup can lead to hard to debug
-        # behavior that might among other result into an unbootable system.
-        self._checkConflictingCommands(_("The %s and autopart commands can't be used at the same time"))
-        return retval
-
     def _getParser(self):
         "Only necessary for the type change documentation"
         op = F18_AutoPart._getParser(self)

pykickstart/commands/logvol.py

@@ -620,9 +620,6 @@ def _getParser(self):
     def parse(self, args):
         # call the overriden method
         retval = F12_LogVol.parse(self, args)
-        # the logvol command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The logvol and %s commands can't be used at the same time"))
 
         if retval.thin_volume and retval.thin_pool:
             errorMsg = _("--thin and --thinpool cannot both be specified for "
@@ -748,10 +745,6 @@ def parse(self, args):
             err = _("--chunksize and --metadatasize are for thin pools only")
             raise KickstartParseError(err, lineno=self.lineno)
 
-        # the logvol command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The logvol and %s commands can't be used at the same time"))
-
         if not retval.preexist and not retval.percent and not retval.size and not retval.recommended and not retval.hibernation:
             errorMsg = _("No size given for logical volume. Use one of --useexisting, --noformat, --size, --percent, or --hibernation.")
             raise KickstartParseError(errorMsg, lineno=self.lineno)

pykickstart/commands/mount.py

@@ -144,7 +144,6 @@ def _getParser(self):
         return op
 
     def parse(self, args):
-        self._checkConflictingCommands(_("The mount and %s commands can't be used at the same time"))
         (ns, extra) = self.op.parse_known_args(args=args, lineno=self.lineno)
 
         if extra:

pykickstart/commands/partition.py

@@ -571,14 +571,6 @@ def _getParser(self):
                         """)
         return op
 
-    def parse(self, args):
-        # first call the overriden command
-        retval = F12_Partition.parse(self, args)
-        # the part command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The part/partition and %s commands can't be used at the same time"))
-
-        return retval
 
 class F14_Partition(F12_Partition):
     removedKeywords = F12_Partition.removedKeywords
@@ -640,9 +632,6 @@ class F20_Partition(F18_Partition):
     def parse(self, args):
         # first call the overriden command
         retval = F18_Partition.parse(self, args)
-        # the part command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The part/partition and %s commands can't be used at the same time"))
 
         # when using tmpfs, grow is not suported
         if retval.fstype == "tmpfs":

pykickstart/commands/raid.py

@@ -632,14 +632,6 @@ def _getParser(self):
                         filesystem.""")
         return op
 
-    def parse(self, args):
-        # first call the overriden method
-        retval = F13_Raid.parse(self, args)
-        # the raid command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The raid and %s commands can't be used at the same time"))
-        return retval
-
 class F14_Raid(F13_Raid):
     removedKeywords = F13_Raid.removedKeywords
     removedAttrs = F13_Raid.removedAttrs
@@ -685,15 +677,6 @@ class F20_Raid(F19_Raid):
     removedAttrs = F19_Raid.removedAttrs
     conflictingCommands = ["autopart", "mount"]
 
-    def parse(self, args):
-        # first call the overriden method
-        retval = F19_Raid.parse(self, args)
-        # the raid command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The raid and %s commands can't be used at the same time"))
-
-        return retval
-
 class F23_Raid(F20_Raid):
     removedKeywords = F20_Raid.removedKeywords
     removedAttrs = F20_Raid.removedAttrs

pykickstart/commands/reqpart.py

@@ -21,8 +21,6 @@
 from pykickstart.base import KickstartCommand
 from pykickstart.options import KSOptionParser
 
-from pykickstart.i18n import _
-
 class F23_ReqPart(KickstartCommand):
     removedKeywords = KickstartCommand.removedKeywords
     removedAttrs = KickstartCommand.removedAttrs
@@ -73,8 +71,6 @@ def _getParser(self):
         return op
 
     def parse(self, args):
-        self._checkConflictingCommands(_("The reqpart and %s commands can't be used at the same time"))
-
         ns = self.op.parse_args(args=args, lineno=self.lineno)
         self.set_to_self(ns)
         self.reqpart = True

pykickstart/commands/volgroup.py

@@ -218,9 +218,6 @@ def parse(self, args):
         if retval.reserved_percent is not None and not 0 < retval.reserved_percent < 100:
             raise KickstartParseError("Volume group reserved space percentage must be between 1 and 99.", lineno=self.lineno)
 
-        # the volgroup command can't be used together with the autopart command
-        # due to the hard to debug behavior their combination introduces
-        self._checkConflictingCommands(_("The volgroup and %s commands can't be used at the same time"))
         return retval
 
 class F21_VolGroup(F16_VolGroup):