From a631200a6b4fbabcfad910245030d4684918346c Mon Sep 17 00:00:00 2001 From: Victor Moene Date: Wed, 29 Jan 2025 14:31:10 +0100 Subject: [PATCH] Made os-release/redhat-release optional Signed-off-by: Victor Moene Ticket: ENT-12576 --- cf_remote/remote.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cf_remote/remote.py b/cf_remote/remote.py index e84cb3c..0f66a41 100644 --- a/cf_remote/remote.py +++ b/cf_remote/remote.py @@ -228,17 +228,13 @@ def get_info(host, *, users=None, connection=None): data["os_release"] = ( os_release(discovery.get("NTD_OS_RELEASE")) if discovery.get("NTD_OS_RELEASE") - else error_and_none(discovery.get("NTD_OS_RELEASE_ERROR")) + else None ) os_release_data = data.get("os_release") redhat_release_data = None if not os_release_data: - redhat_release_data = ( - discovery.get("NTD_REDHAT_RELEASE") - if discovery.get("NTD_REDHAT_RELEASE") - else error_and_none(discovery.get("NTD_REDHAT_RELEASE_ERROR")) - ) + redhat_release_data = discovery.get("NTD_REDHAT_RELEASE") data["redhat_release"] = redhat_release_data data["package_tags"] = get_package_tags(os_release_data, redhat_release_data)