Skip to content

Fix 'occured' -> 'occurred' typos in salt logging strings #68945

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

Closed
SAY-5 wants to merge 2 commits into from
Closed

Fix 'occured' -> 'occurred' typos in salt logging strings #68945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad4602
Fix 'occured' -> 'occurred' typos in salt logging strings
SAY-5 Apr 15, 2026
7d1d825
salt/crypt: black-wrap log.exception to satisfy pre-commit line-length
SAY-5 Apr 16, 2026
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/cli/daemons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def prepare(self):
self.minion = salt.minion.MinionManager(self.config)
except Exception: # pylint: disable=broad-except
log.error(
"An error occured while setting up the minion manager", exc_info=True
"An error occurred while setting up the minion manager", exc_info=True
)
self.shutdown(1)

Expand Down
4 changes: 3 additions & 1 deletion salt/crypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,9 @@ def decrypt_aes(self, payload, master_pub=True):
try:
mkey = PublicKey.from_file(m_path)
except Exception: # pylint: disable=broad-except
log.exception("Something unexpected occured loading master pub-key")
log.exception(
"Something unexpected occurred loading master pub-key"
)
return "", ""
digest = hashlib.sha256(key_str).hexdigest()
digest = salt.utils.stringutils.to_bytes(digest)
Expand Down
Loading