Remove legacy kconfig_check and menuconfig args

Fixes #1690
This commit is contained in:
Luca Weiss 2018-11-28 11:20:33 +01:00 committed by Oliver Smith
parent 0e9644c0f9
commit 9c037831a0
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 11 additions and 24 deletions

View File

@ -187,13 +187,6 @@ def export(args):
pmb.export.frontend(args)
def menuconfig(args):
logging.warning("WARNING: 'pmbootstrap menuconfig' is deprecated and will"
" soon be removed. Please use 'pmbootstrap kconfig edit'"
" instead.")
pmb.build.menuconfig(args, args.package)
def update(args):
existing_only = not args.non_existing
if not pmb.helpers.repo.update(args, args.arch, True, existing_only):

View File

@ -223,18 +223,16 @@ def arguments_kconfig(subparser):
check.add_argument("--arch", choices=arch_choices, dest="arch")
check.add_argument("package", default="", nargs='?')
# "pmbootstrap kconfig edit" (legacy: "pmbootstrap menuconfig")
legacy_menuconfig = subparser.add_parser("menuconfig")
# "pmbootstrap kconfig edit"
edit = sub.add_parser("edit", help="edit kernel aport config")
for parser in [edit, legacy_menuconfig]:
parser.add_argument("--arch", choices=arch_choices, dest="arch")
parser.add_argument("-x", dest="xconfig", action="store_true",
help="use xconfig rather than ncurses for kernel"
" configuration")
parser.add_argument("-g", dest="gconfig", action="store_true",
help="use gconfig rather than ncurses for kernel"
" configuration")
parser.add_argument("package")
edit.add_argument("--arch", choices=arch_choices, dest="arch")
edit.add_argument("-x", dest="xconfig", action="store_true",
help="use xconfig rather than ncurses for kernel"
" configuration")
edit.add_argument("-g", dest="gconfig", action="store_true",
help="use gconfig rather than ncurses for kernel"
" configuration")
edit.add_argument("package")
def packagecompleter(prefix, action, parser, parsed_args):
@ -463,13 +461,9 @@ def arguments():
if argcomplete:
argument_packages.completer = packagecompleter
# Action: kconfig_check / apkbuild_parse
kconfig_check = sub.add_parser("kconfig_check", help="check, whether all"
" the necessary options are"
" enabled/disabled in the kernel config")
# Action: apkbuild_parse
apkbuild_parse = sub.add_parser("apkbuild_parse")
for action in [kconfig_check, apkbuild_parse]:
action.add_argument("packages", nargs="*")
apkbuild_parse.add_argument("packages", nargs="*")
# Action: apkindex_parse
apkindex_parse = sub.add_parser("apkindex_parse")