From fcdbae91a98c1ec0c4ba576b0bd5a9f4b0b70c60 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 4 Dec 2017 19:31:25 +0100 Subject: [PATCH] Pykickstart 3 support Pykickstart 3 uses Argparse as the option parser, and there is the new requirement for specifying when the given command has been introduced, which can be used for kickstart file validation and/or to generate documentation. For more information about Pykickstart 2 to 3 porting see: https://github.com/rhinstaller/pykickstart/blob/master/docs/2to3 So change the Kdump addon kickstart parsing code accordingly. --- com_redhat_kdump/ks/kdump.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/com_redhat_kdump/ks/kdump.py b/com_redhat_kdump/ks/kdump.py index ec4ab35..99e9a66 100644 --- a/com_redhat_kdump/ks/kdump.py +++ b/com_redhat_kdump/ks/kdump.py @@ -26,6 +26,7 @@ from pykickstart.options import KSOptionParser from pykickstart.errors import KickstartParseError, formatErrorMsg +from pykickstart.version import F27 from com_redhat_kdump.common import getMemoryBounds from com_redhat_kdump.i18n import _ from com_redhat_kdump.constants import FADUMP_CAPABLE_FILE @@ -92,17 +93,18 @@ def setup(self, storage, ksdata, instClass, payload): storage.bootloader.boot_args.add('fadump=on') def handle_header(self, lineno, args): - op = KSOptionParser() - op.add_option("--enable", action="store_true", default=True, - dest="enabled", help="Enable kdump") - op.add_option("--enablefadump", action="store_true", default=False, - dest="enablefadump", help="Enable dump mode fadump") - op.add_option("--disable", action="store_false", - dest="enabled", help="Disable kdump") - op.add_option("--reserve-mb", type="string", dest="reserveMB", - default="128", help="Amount of memory in MB to reserve for kdump.") - - (opts, extra) = op.parse_args(args=args, lineno=lineno) + op = KSOptionParser(prog="addon com_redhat_kdump", version=F27, + description="Configure the Kdump Addon.") + op.add_argument("--enable", action="store_true", default=True, + version=F27, dest="enabled", help="Enable kdump") + op.add_argument("--enablefadump", action="store_true", default=False, + version=F27, dest="enablefadump", help="Enable dump mode fadump") + op.add_argument("--disable", action="store_false", + version=F27, dest="enabled", help="Disable kdump") + op.add_argument("--reserve-mb", type=str, dest="reserveMB", + version=F27, default="128", help="Amount of memory in MB to reserve for kdump.") + + (opts, extra) = op.parse_known_args(args=args, lineno=lineno) # Reject any additional arguments if extra: