From c6ad839942dddeb1ec2ef1ccc373cf4977316899 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Aug 16 2021 11:41:07 +0000 Subject: cli: improve --config and --profile help text Move "--profile" to the top of the argument list so it's easier to see in --help. Most users should use --profile instead of --config. Explain what the default --profile value is (it's progname). Reword the "--config" help text to explain that this overrides a profile's settings using a separate configuration file. --- diff --git a/cli/koji b/cli/koji index 05ae44f..3ac3bc9 100755 --- a/cli/koji +++ b/cli/koji @@ -115,10 +115,10 @@ def get_options(): "%(origin_format_help)s%(epilog)s" % ({ 'origin_format_help': parser.origin_format_help(formatter), 'epilog': get_epilog_str()})) - parser.add_option("-c", "--config", dest="configFile", - help=_("use alternate configuration file"), metavar="FILE") parser.add_option("-p", "--profile", default=progname, - help=_("specify a configuration profile")) + help=_("specify a configuration profile. default: %s" % progname)) + parser.add_option("-c", "--config", dest="configFile", + help=_("load profile's settings from another file"), metavar="FILE") parser.add_option("--keytab", help=_("specify a Kerberos keytab to use"), metavar="FILE") parser.add_option("--principal", help=_("specify a Kerberos principal to use")) parser.add_option("--cert", help=_("specify a SSL cert to use"), metavar="FILE")