Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Account for features being None #63380

Merged
merged 1 commit into from
Dec 28, 2022
Merged

Account for features being None #63380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/modules/x509.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def __virtual__():
only load this module if m2crypto is available
"""
# salt.features appears to not be setup when invoked via peer publishing
if __opts__.get("features").get("x509_v2"):
if __opts__.get("features", {}).get("x509_v2"):
return (False, "Superseded, using x509_v2")
if HAS_M2:
salt.utils.versions.warn_until(
Expand Down
2 changes: 1 addition & 1 deletion salt/modules/x509_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def __virtual__():
if not HAS_CRYPTOGRAPHY:
return (False, "Could not load cryptography")
# salt.features appears to not be setup when invoked via peer publishing
if not __opts__.get("features").get("x509_v2"):
if not __opts__.get("features", {}).get("x509_v2"):
return (
False,
"x509_v2 needs to be explicitly enabled by setting `x509_v2: true` "
Expand Down