Browse Source

fix ldap lib loading after apt install

Nick Sweeting 1 year ago
parent
commit
2f68a1d476
2 changed files with 4 additions and 4 deletions
  1. 3 3
      archivebox/misc/checks.py
  2. 1 1
      archivebox/plugins_auth/ldap/apps.py

+ 3 - 3
archivebox/misc/checks.py

@@ -80,9 +80,9 @@ def check_not_root():
     from archivebox.config.permissions import IS_ROOT, IN_DOCKER
     from archivebox.config.permissions import IS_ROOT, IN_DOCKER
     
     
     attempted_command = ' '.join(sys.argv[1:]) if len(sys.argv) > 1 else ''
     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):
     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)
         print('[red][!] ArchiveBox should never be run as root![/red]', file=sys.stderr)

+ 1 - 1
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'],
             "packages": lambda: ['python-ldap>=3.4.3', 'django-auth-ldap>=4.1.0'],
         },
         },
         apt.name: {
         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(),
             "version": lambda: get_LDAP_LIB_version(),
             "packages": lambda: ['libssl-dev', 'libldap2-dev', 'libsasl2-dev', 'python3-ldap', 'python3-msgpack', 'python3-mutagen'],
             "packages": lambda: ['libssl-dev', 'libldap2-dev', 'libsasl2-dev', 'python3-ldap', 'python3-msgpack', 'python3-mutagen'],
         },
         },