Skip to content

Commit

Permalink
Merge pull request #541 from will-moore/fix_kwargs_overwrite_in_scrip…
Browse files Browse the repository at this point in the history
…t_activities

Don't overwrite kwargs in activities json
  • Loading branch information
knabar authored Mar 12, 2024
2 parents 71372e9 + d99c184 commit 99aebd2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions omeroweb/webclient/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3851,16 +3851,16 @@ def activities(request, conn=None, **kwargs):
try:
# we can only retrieve this ONCE - must save results
results = proc.getResults(0, conn.SERVICE_OPTS)
kwargs = {
update_kwargs = {
"status": "finished",
"returncode": cb.returncode,
}
if cb.returncode != 0:
kwargs["Message"] = (
update_kwargs["Message"] = (
f"Script exited with failure."
f" (returncode={cb.returncode})"
)
update_callback(request, cbString, **kwargs)
update_callback(request, cbString, **update_kwargs)
new_results.append(cbString)
except Exception:
update_callback(
Expand Down

0 comments on commit 99aebd2

Please sign in to comment.