Skip to content

Commit

Permalink
Merge pull request #116 from victormlg/redhat-no-error
Browse files Browse the repository at this point in the history
Made os-release/redhat-release optional
  • Loading branch information
olehermanse authored Jan 29, 2025
2 parents 6cd65af + a631200 commit 84a5234
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions cf_remote/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 84a5234

Please sign in to comment.