particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli: deprecate --ca

Browse source 
Fixes: https://pagure.io/koji/issue/2182
This commit is contained in:
Tomas Kopecek 2020-05-06 16:36:19 +02:00
parent 6c87b18626
commit 0e5b54f32d
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/koji
View file

@ -121,7 +121,7 @@ def get_options():
parser.add_option("--principal", help=_("specify a Kerberos principal to use"))
parser.add_option("--krbservice", help=_("specify the Kerberos service name for the hub"))
parser.add_option("--cert", help=_("specify a SSL cert to use"), metavar="FILE")
parser.add_option("--ca", help=_("specify a SSL CA to use"), metavar="FILE")
parser.add_option("--ca", help=SUPPRESS_HELP, metavar="FILE")
parser.add_option("--runas", help=_("run as the specified user (requires special privileges)"))
parser.add_option("--user", help=_("specify user"))
parser.add_option("--password", help=_("specify password"))

3
koji/__init__.py
View file

@ -1914,6 +1914,9 @@ def read_config(profile_name, user_config=None):
else:
result[name] = os.path.expanduser(result[name])
if result.get('ca'):
util.deprecated("--ca option is deprecated and will be removed in 1.24")
return result

8
util/koji-gc
View file

@ -27,7 +27,7 @@ from six.moves import email_mime_text as MIMEText
import koji
import koji.policy
from koji.util import LazyDict, LazyValue, to_list
from koji.util import LazyDict, LazyValue, to_list, deprecated
def _(args):
@ -54,8 +54,7 @@ def get_options():
parser.add_option("--network-hack", action="store_true", default=False,
help=optparse.SUPPRESS_HELP) # no longer used
parser.add_option("--cert", help=_("Client SSL certificate file for authentication"))
parser.add_option("--ca", default='',
help=_("ignored")) # FIXME: remove in next major release
parser.add_option("--ca", help=optparse.SUPPRESS_HELP) # FIXME: remove in next major release
parser.add_option("--serverca", help=_("CA cert file that issued the hub certificate"))
parser.add_option("-n", "--test", action="store_true", default=False,
help=_("test mode"))
@ -164,6 +163,9 @@ def get_options():
(options, args) = parser.parse_args(values=defaults)
options.config = config
if options.ca:
deprecated("--ca option is deprecated and will be removed in 1.24")
# figure out actions
actions = ('prune', 'trash', 'delete', 'salvage')
if options.action: