From 743c3bd12631b6d0a354229dcafa301bbc734581 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: May 18 2020 07:29:12 +0000 Subject: PR#2246: deprecated warning for cli option --ca as well Merges #2246 https://pagure.io/koji/pull-request/2246 Fixes: #2182 https://pagure.io/koji/issue/2182 Properly deprecate --ca option for koji/koji-gc --- diff --git a/cli/koji b/cli/koji index cc50be7..d4e1d93 100755 --- a/cli/koji +++ b/cli/koji @@ -150,6 +150,9 @@ def get_options(): help=_("list commands")) (options, args) = parser.parse_args() + if options.ca: + koji.util.deprecated("--ca option is deprecated and will be removed in 1.24") + # load local config try: result = koji.read_config(options.profile, user_config=options.configFile) diff --git a/koji/__init__.py b/koji/__init__.py index 9c3ed94..8f02523 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1915,7 +1915,7 @@ def read_config(profile_name, user_config=None): result[name] = os.path.expanduser(result[name]) if result.get('ca'): - util.deprecated("--ca option is deprecated and will be removed in 1.24") + util.deprecated("ca option in config file is deprecated and will be removed in 1.24") return result