0.4.27-15-g3ab9608.revert-added-path-for-local-homebrew-installation-267.patch 976 B

123456789101112131415161718192021222324252627282930313233343536
  1. Subject: Revert "added path for local homebrew installation (#267)"
  2. Origin: upstream, commit 0.4.27-15-g3ab9608 <https://github.com/ahupp/python-magic/commit/0.4.27-15-g3ab9608>
  3. Author: Adam Hupp <adam@hupp.org>
  4. Date: Thu Mar 30 11:22:46 2023 -0700
  5. This reverts commit cd3929fa7cbc2e383629d0893fc08bcb68a7614c.
  6. --- a/magic/loader.py
  7. +++ b/magic/loader.py
  8. @@ -3,7 +3,6 @@
  9. import sys
  10. import glob
  11. import os.path
  12. -import subprocess
  13. def _lib_candidates():
  14. @@ -14,16 +13,8 @@
  15. paths = [
  16. '/opt/local/lib',
  17. '/usr/local/lib',
  18. - '/opt/homebrew/lib'
  19. - ]
  20. -
  21. - try:
  22. - local_brew_path = subprocess.check_output(['brew', '--prefix']).decode('UTF-8')
  23. - paths.append(f'{local_brew_path.strip()}/lib')
  24. - except:
  25. - pass
  26. -
  27. - paths += glob.glob('/usr/local/Cellar/libmagic/*/lib')
  28. + '/opt/homebrew/lib',
  29. + ] + glob.glob('/usr/local/Cellar/libmagic/*/lib')
  30. for i in paths:
  31. yield os.path.join(i, 'libmagic.dylib')