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

remove deprecated --ca option

Browse source 
Fixes: https://pagure.io/koji/issue/2192
This commit is contained in:
Tomas Kopecek 2020-10-06 13:48:05 +02:00
parent 7ba3e93e20
commit 0f56d39487
7 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/koji-gc
View file

@ -23,7 +23,7 @@ import requests
import koji
import koji.policy
from koji.util import LazyDict, LazyValue, to_list, deprecated
from koji.util import LazyDict, LazyValue, to_list
def _(args):
@ -50,7 +50,6 @@ 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", help=optparse.SUPPRESS_HELP) # FIXME: remove in 1.24
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"))
@ -127,7 +126,6 @@ def get_options():
['password', None, 'string'],
['noauth', None, 'boolean'],
['cert', None, 'string'],
['ca', None, 'string'], # FIXME: remove in next major release
['serverca', None, 'string'],
['server', None, 'string'],
['weburl', None, 'string'],
@ -169,9 +167,6 @@ 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:

5
util/kojira
View file

@ -1137,7 +1137,6 @@ def get_options():
'recent_tasks_lifetime': 600,
'sleeptime': 15,
'cert': None,
'ca': '', # FIXME: unused, remove in next major release
'serverca': None,
'queue_file': None,
}
@ -1147,8 +1146,8 @@ def get_options():
'max_delete_processes', 'max_repo_tasks_maven', 'dist_repo_lifetime',
'sleeptime', 'recent_tasks_lifetime')
str_opts = ('topdir', 'server', 'user', 'password', 'logfile', 'principal', 'keytab',
'cert', 'ca', 'serverca', 'debuginfo_tags', 'queue_file',
'source_tags', 'separate_source_tags', 'ignore_tags') # FIXME: remove ca here
'cert', 'serverca', 'debuginfo_tags', 'queue_file',
'source_tags', 'separate_source_tags', 'ignore_tags')
bool_opts = ('verbose', 'debug', 'ignore_stray_repos', 'offline_retry',
'no_ssl_verify', 'check_external_repos')
legacy_opts = ('with_src', 'delete_batch_size')