From 2f68a1d476cdeb4c3ddb3c6566c6328f70385dc5 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Wed, 9 Oct 2024 04:03:02 -0700 Subject: [PATCH] fix ldap lib loading after apt install --- archivebox/misc/checks.py | 6 +++--- archivebox/plugins_auth/ldap/apps.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archivebox/misc/checks.py b/archivebox/misc/checks.py index 6f550d99..4d12b7df 100644 --- a/archivebox/misc/checks.py +++ b/archivebox/misc/checks.py @@ -80,9 +80,9 @@ def check_not_root(): from archivebox.config.permissions import IS_ROOT, IN_DOCKER attempted_command = ' '.join(sys.argv[1:]) if len(sys.argv) > 1 else '' - is_getting_help = '-h' in sys.argv or '--help' in sys.argv or 'help' in sys.argv[:2] - is_getting_version = '--version' in sys.argv or 'version' in sys.argv[:2] - is_installing = 'setup' in sys.argv[:2] or 'install' in sys.argv[:2] + is_getting_help = '-h' in sys.argv or '--help' in sys.argv or 'help' in sys.argv + is_getting_version = '--version' in sys.argv or 'version' in sys.argv + is_installing = 'setup' in sys.argv or 'install' in sys.argv if IS_ROOT and not (is_getting_help or is_getting_version or is_installing): print('[red][!] ArchiveBox should never be run as root![/red]', file=sys.stderr) diff --git a/archivebox/plugins_auth/ldap/apps.py b/archivebox/plugins_auth/ldap/apps.py index 61b92f58..a2d44706 100644 --- a/archivebox/plugins_auth/ldap/apps.py +++ b/archivebox/plugins_auth/ldap/apps.py @@ -57,7 +57,7 @@ class LdapBinary(BaseBinary): "packages": lambda: ['python-ldap>=3.4.3', 'django-auth-ldap>=4.1.0'], }, apt.name: { - "abspath": lambda: get_LDAP_LIB_path(SYS_SITE_PACKAGES), + "abspath": lambda: get_LDAP_LIB_path((*USER_SITE_PACKAGES, *SYS_SITE_PACKAGES)), "version": lambda: get_LDAP_LIB_version(), "packages": lambda: ['libssl-dev', 'libldap2-dev', 'libsasl2-dev', 'python3-ldap', 'python3-msgpack', 'python3-mutagen'], },