Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check /usr/lib64 for plugins before /usr/lib #1

Merged
merged 1 commit into from
Mar 24, 2016
Merged

Check /usr/lib64 for plugins before /usr/lib #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions k5test/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ def find_plugin_dir():

# if there was no LD_LIBRARY_PATH, or the above failed
if _PLUGIN_DIR is None:
# if we don't have a LD_LIBRARY_PATH, just search in
# $prefix/lib
lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64')
_PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))

# /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family
if _PLUGIN_DIR is None:
lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib')
_PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))

Expand Down