From f4751766dbd5f122844368a5f3bf211b1ff303c0 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 17 Jun 2024 13:26:41 -0700 Subject: [PATCH] selinux compat - add ignore, proper ex chaining (#83460) --- lib/ansible/module_utils/compat/selinux.py | 4 ++-- test/sanity/ignore.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/compat/selinux.py b/lib/ansible/module_utils/compat/selinux.py index 0900388b761..a7a19cfd63f 100644 --- a/lib/ansible/module_utils/compat/selinux.py +++ b/lib/ansible/module_utils/compat/selinux.py @@ -11,8 +11,8 @@ from ctypes import CDLL, c_char_p, c_int, byref, POINTER, get_errno try: _selinux_lib = CDLL('libselinux.so.1', use_errno=True) -except OSError: - raise ImportError('unable to load libselinux.so') +except OSError as ex: + raise ImportError('unable to load libselinux.so') from ex def _module_setup(): diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 9ce5cc665fd..cffb6d6b7d6 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -43,6 +43,7 @@ lib/ansible/module_utils/compat/selinux.py import-3.9!skip # pass/fail depends o lib/ansible/module_utils/compat/selinux.py import-3.10!skip # pass/fail depends on presence of libselinux.so lib/ansible/module_utils/compat/selinux.py import-3.11!skip # pass/fail depends on presence of libselinux.so lib/ansible/module_utils/compat/selinux.py import-3.12!skip # pass/fail depends on presence of libselinux.so +lib/ansible/module_utils/compat/selinux.py import-3.13!skip # pass/fail depends on presence of libselinux.so lib/ansible/module_utils/compat/selinux.py pylint:unidiomatic-typecheck lib/ansible/module_utils/distro/_distro.py no-assert lib/ansible/module_utils/distro/__init__.py empty-init # breaks namespacing, bundled, do not override