From 041de1a7c89490d326824ab8a026235dd293c68a Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Oct 06 2020 12:23:28 +0000 Subject: PR#2525: cli: load plugins also from /usr/lib64 Merges #2525 https://pagure.io/koji/pull-request/2525 Fixes: #2524 https://pagure.io/koji/issue/2524 CLI looks only to /usr/lib for plugins --- diff --git a/cli/koji b/cli/koji index 284230a..f4b5e48 100755 --- a/cli/koji +++ b/cli/koji @@ -74,11 +74,13 @@ def load_plugins(plugin_paths): before""" logger = logging.getLogger('koji.plugins') - paths = [] # first, always load plugins from koji_cli_plugins module - paths.append( - '%s/lib/python%s.%s/site-packages/koji_cli_plugins' % - (sys.prefix, sys.version_info[0], sys.version_info[1])) + paths = [ + '%s/lib/python%s.%s/site-packages/koji_cli_plugins' % + (sys.prefix, sys.version_info[0], sys.version_info[1]), + '%s/lib64/python%s.%s/site-packages/koji_cli_plugins' % + (sys.prefix, sys.version_info[0], sys.version_info[1]) + ] # second, always load plugins from ~/.koji/plugins paths.append(os.path.expanduser('~/.koji/plugins')) # finally, update plugin_paths to the list