diff --git a/ansible-core.changes b/ansible-core.changes index 2c6e8db..86e4943 100644 --- a/ansible-core.changes +++ b/ansible-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 26 12:43:54 UTC 2025 - Harshvardhan Sharma + +- Extend suse-distribution-fix.patch: + * Also detect VARIANT_ID='sles-sap' as SLES_SAP + ------------------------------------------------------------------- Tue May 20 10:18:01 UTC 2025 - Harshvardhan Sharma diff --git a/suse-distribution-fix.patch b/suse-distribution-fix.patch index 2d12d41..aa7de39 100644 --- a/suse-distribution-fix.patch +++ b/suse-distribution-fix.patch @@ -1,6 +1,6 @@ -From b1edc4d3fd9136f81abd01c4b44f356a69e0b746 Mon Sep 17 00:00:00 2001 +From bffda9eb661a8560bb9ac9e240ec70a2552aa2a8 Mon Sep 17 00:00:00 2001 From: HVSharma12 -Date: Tue, 22 Apr 2025 19:21:35 +0530 +Date: Mon, 26 May 2025 18:08:53 +0530 Subject: [PATCH] Adjust distribution detection logic for SUSE --- @@ -8,7 +8,7 @@ Subject: [PATCH] Adjust distribution detection logic for SUSE 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/facts/system/distribution.py b/lib/ansible/module_utils/facts/system/distribution.py -index 7554ef1ae3..77c39182b1 100644 +index 7554ef1ae3..5ec94c92d1 100644 --- a/lib/ansible/module_utils/facts/system/distribution.py +++ b/lib/ansible/module_utils/facts/system/distribution.py @@ -311,9 +311,22 @@ class DistributionFiles: @@ -22,7 +22,7 @@ index 7554ef1ae3..77c39182b1 100644 + variant_id_match = re.search(r'^VARIANT_ID="?([^"\n]*)"?', data, re.MULTILINE) + if variant_id_match: + variant_id = variant_id_match.group(1) -+ if variant_id == 'server-sap': ++ if variant_id in ('server-sap', 'sles-sap'): + suse_facts['distribution'] = 'SLES_SAP' + elif variant_id == 'transactional': + suse_facts['distribution'] = 'SL-Micro'