Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-11 04:43:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29928 from superbigcup325:fix/python-empty-ld-library-path-entry-4x

Browse Source 
python: avoid empty LD_LIBRARY_PATH/PATH entries on import (4.x backport of #29905)
This commit is contained in:
Alexander Smorkalov
2026-09-11 08:46:07 +03:00
committed by GitHub
parent 0aa49a8ef5 600bcf4b21
commit 5d174966e2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/python/package/cv2/__init__.py
View File

@@ -20,6 +20,14 @@ except ImportError:
# is_x64 = sys.maxsize > 2**32
def _prepend_env_paths(env_key, paths, sep):
extra = [p for p in paths if p]
if not extra:
return
old = os.environ.get(env_key)
os.environ[env_key] = sep.join(extra) + ((sep + old) if old else '')
def __load_extra_py_code_for_module(base, name, enable_debug_print=False):
module_name = "{}.{}".format(__name__, name)
export_module_name = "{}.{}".format(base, name)
@@ -140,11 +148,11 @@ def bootstrap():
except Exception as e:
if DEBUG: print('Failed os.add_dll_directory(): '+ str(e))
pass
os.environ['PATH'] = ';'.join(l_vars['BINARIES_PATHS']) + ';' + os.environ.get('PATH', '')
if DEBUG: print('OpenCV loader: PATH={}'.format(str(os.environ['PATH'])))
_prepend_env_paths('PATH', l_vars['BINARIES_PATHS'], ';')
if DEBUG: print('OpenCV loader: PATH={}'.format(str(os.environ.get('PATH'))))
else:
# amending of LD_LIBRARY_PATH works for sub-processes only
os.environ['LD_LIBRARY_PATH'] = ':'.join(l_vars['BINARIES_PATHS']) + ':' + os.environ.get('LD_LIBRARY_PATH', '')
_prepend_env_paths('LD_LIBRARY_PATH', l_vars['BINARIES_PATHS'], ':')
if DEBUG: print("Relink everything from native cv2 module to cv2 package")