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

12345678910111213141516171819202122232425262728293031323334353637
  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. Forwarded: not-needed
  6. This reverts commit cd3929fa7cbc2e383629d0893fc08bcb68a7614c.
  7. --- a/magic/loader.py
  8. +++ b/magic/loader.py
  9. @@ -3,7 +3,6 @@
  10. import sys
  11. import glob
  12. import os.path
  13. -import subprocess
  14. def _lib_candidates():
  15. @@ -14,16 +13,8 @@
  16. paths = [
  17. '/opt/local/lib',
  18. '/usr/local/lib',
  19. - '/opt/homebrew/lib'
  20. - ]
  21. -
  22. - try:
  23. - local_brew_path = subprocess.check_output(['brew', '--prefix']).decode('UTF-8')
  24. - paths.append(f'{local_brew_path.strip()}/lib')
  25. - except:
  26. - pass
  27. -
  28. - paths += glob.glob('/usr/local/Cellar/libmagic/*/lib')
  29. + '/opt/homebrew/lib',
  30. + ] + glob.glob('/usr/local/Cellar/libmagic/*/lib')
  31. for i in paths:
  32. yield os.path.join(i, 'libmagic.dylib')