diff options
| author | Kevin Cox <kevincox@kevincox.ca> | 2021-08-13 21:08:58 +0000 |
|---|---|---|
| committer | Kevin Cox <kevincox@kevincox.ca> | 2021-08-13 21:08:58 +0000 |
| commit | f5e552ec014d31571818ed31bbb9056fac55b200 (patch) | |
| tree | fbc7259a829585e331b8ed8b683e99abcd20236b /pkgs/development/python-modules/python-magic/libmagic-path.patch | |
| parent | 12d2e28182a3ce6d29aad4f2fdb4134321da8e96 (diff) | |
| parent | 9bacc3c32f2d06b9159e3b523b710a7218cf89b2 (diff) | |
Merge remote-tracking branch 'u/staging' into openmoji
Diffstat (limited to 'pkgs/development/python-modules/python-magic/libmagic-path.patch')
| -rw-r--r-- | pkgs/development/python-modules/python-magic/libmagic-path.patch | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/python-magic/libmagic-path.patch b/pkgs/development/python-modules/python-magic/libmagic-path.patch index 5a1dbec7d51b..e9530d6ddf75 100644 --- a/pkgs/development/python-modules/python-magic/libmagic-path.patch +++ b/pkgs/development/python-modules/python-magic/libmagic-path.patch @@ -1,17 +1,28 @@ -diff --git a/magic/loader.py b/magic/loader.py -index 6b2bfcb..69778af 100644 ---- a/magic/loader.py -+++ b/magic/loader.py -@@ -5,11 +5,7 @@ import glob +diff --git i/magic/loader.py w/magic/loader.py +index 931f161..b8096d1 100644 +--- i/magic/loader.py ++++ w/magic/loader.py +@@ -35,16 +35,12 @@ def _lib_candidates(): + + def load_lib(): - libmagic = None - # Let's try to find magic or magic1 -- dll = ctypes.util.find_library('magic') \ -- or ctypes.util.find_library('magic1') \ -- or ctypes.util.find_library('cygmagic-1') \ -- or ctypes.util.find_library('libmagic-1') \ -- or ctypes.util.find_library('msys-magic-1') # for MSYS2 -+ dll = '@libmagic@' ++ lib = '@libmagic@' + +- for lib in _lib_candidates(): +- # find_library returns None when lib not found +- if lib is None: +- continue +- try: +- return ctypes.CDLL(lib) +- except OSError: +- pass +- else: +- # It is better to raise an ImportError since we are importing magic module +- raise ImportError('failed to find libmagic. Check your installation') ++ try: ++ return ctypes.CDLL(lib) ++ except OSError: ++ pass - # necessary because find_library returns None if it doesn't find the library - if dll: ++ # It is better to raise an ImportError since we are importing magic module ++ raise ImportError('failed to find libmagic. Check your installation') |