Skip to content

Commit

Permalink
bugfix/scheduler-permission-error (#436)
Browse files Browse the repository at this point in the history
  • Loading branch information
bgunnar5 authored Aug 4, 2023
1 parent 12ff3d7 commit 5c69c0b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- A bug where the openfoam_wf_singularity example was not being found
- Some build warnings in the docs (unknown targets, duplicate targets, title underlines too short, etc.)
- A bug where when the output path contained a variable that was overridden, the overridden variable was not changed in the output_path
- A bug where permission denied errors happened when checking for system scheduler

### Added
- Tests for ensuring `$(MERLIN_SPEC_ORIGINAL_TEMPLATE)`, `$(MERLIN_SPEC_ARCHIVED_COPY)`, and `$(MERLIN_SPEC_EXECUTED_RUN)` are stored correctly
Expand Down
2 changes: 1 addition & 1 deletion merlin/study/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def check_for_scheduler(scheduler, scheduler_legend):
if result and len(result) > 0 and scheduler_legend[scheduler]["expected check output"] in result[0]:
return True
return False
except FileNotFoundError:
except (FileNotFoundError, PermissionError):
return False


Expand Down

0 comments on commit 5c69c0b

Please sign in to comment.