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

17635 fix script AbortTransaction #17764

Merged
merged 2 commits into from
Oct 18, 2024
Merged

17635 fix script AbortTransaction #17764

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a16536
17635 fix script AbortTransaction
arthanson Oct 15, 2024
ff8f8be
17635 review changes
arthanson Oct 16, 2024
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
3 changes: 3 additions & 0 deletions netbox/extras/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ def run_script(self, script, request, data, commit):
logger.warning("Script failed")
raise

except AbortTransaction:
# this is already handled above.
pass
except Exception as e:
if type(e) is AbortScript:
msg = _("Script aborted with error: ") + str(e)
Expand Down