Merge pull request #5436 from poncovka/master-f40_remove_deprecations

Remove deprecated kickstart commands and options
rhinstaller · Feb 6, 2024 · 5d78d87 · 5d78d87
2 parents 2dff0aa + 17916bd
commit 5d78d87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/anaconda.spec.in b/anaconda.spec.in
@@ -38,7 +38,7 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 %define libxklavierver 5.4
 %define mehver 0.23-1
 %define nmver 1.0
-%define pykickstartver 3.51-1
+%define pykickstartver 3.52-1
 %define pypartedver 2.5-2
 %define pythonblivetver 1:3.8.2-2
 %define rpmver 4.15.0

diff --git a/pyanaconda/core/kickstart/commands.py b/pyanaconda/core/kickstart/commands.py
@@ -25,7 +25,6 @@
 # Supported kickstart commands.
 from pykickstart.commands.authselect import F28_Authselect as Authselect
 from pykickstart.commands.autopart import F38_AutoPart as AutoPart
-from pykickstart.commands.autostep import F34_AutoStep as AutoStep
 from pykickstart.commands.bootloader import F39_Bootloader as Bootloader
 from pykickstart.commands.btrfs import F23_BTRFS as BTRFS
 from pykickstart.commands.cdrom import FC3_Cdrom as Cdrom
@@ -46,10 +45,9 @@
 from pykickstart.commands.keyboard import F18_Keyboard as Keyboard
 from pykickstart.commands.lang import F19_Lang as Lang
 from pykickstart.commands.liveimg import F19_Liveimg as Liveimg
-from pykickstart.commands.logging import F34_Logging as Logging
+from pykickstart.commands.logging import F40_Logging as Logging
 from pykickstart.commands.logvol import F29_LogVol as LogVol
 from pykickstart.commands.mediacheck import FC4_MediaCheck as MediaCheck
-from pykickstart.commands.method import F34_Method as Method
 from pykickstart.commands.mount import F27_Mount as Mount
 from pykickstart.commands.network import F39_Network as Network
 from pykickstart.commands.nfs import FC6_NFS as NFS
@@ -60,7 +58,7 @@
 from pykickstart.commands.raid import F29_Raid as Raid
 from pykickstart.commands.realm import F19_Realm as Realm
 from pykickstart.commands.reboot import F23_Reboot as Reboot
-from pykickstart.commands.repo import F33_Repo as Repo
+from pykickstart.commands.repo import F40_Repo as Repo
 from pykickstart.commands.reqpart import F23_ReqPart as ReqPart
 from pykickstart.commands.rescue import F10_Rescue as Rescue
 from pykickstart.commands.rhsm import RHEL8_RHSM as RHSM
@@ -72,7 +70,7 @@
 from pykickstart.commands.sshpw import F24_SshPw as SshPw
 from pykickstart.commands.sshkey import F22_SshKey as SshKey
 from pykickstart.commands.syspurpose import RHEL8_Syspurpose as Syspurpose
-from pykickstart.commands.timezone import F33_Timezone as Timezone
+from pykickstart.commands.timezone import F40_Timezone as Timezone
 from pykickstart.commands.timesource import F33_Timesource as Timesource
 from pykickstart.commands.updates import F34_Updates as Updates
 from pykickstart.commands.url import F30_Url as Url

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
@@ -191,13 +191,11 @@ class AnacondaKickstartSpecification(KickstartSpecification):
     """The kickstart specification of the main process."""
 
     commands = {
-        "autostep": COMMANDS.AutoStep,
         "cmdline": COMMANDS.DisplayMode,
         "eula": COMMANDS.Eula,
         "graphical": COMMANDS.DisplayMode,
         "halt": COMMANDS.Reboot,
         "logging": COMMANDS.Logging,
-        "method": COMMANDS.Method,
         "poweroff": COMMANDS.Reboot,
         "reboot": COMMANDS.Reboot,
         "rescue": COMMANDS.Rescue,