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

PR#2525: cli: load plugins also from /usr/lib64

Browse source 
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
This commit is contained in:
Tomas Kopecek 2020-10-06 14:23:28 +02:00
commit 041de1a7c8
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cli/koji
View file

@ -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