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

Raise DestinationExistsError from EEXIST. #433

Merged
merged 5 commits into from
Dec 16, 2020
Merged

Raise DestinationExistsError from EEXIST. #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b364e57
Add EEXIST to list of OSError error numbers that should raise Destina…
bdice Dec 14, 2020
29ab745
Re-run CI tests.
bdice Dec 14, 2020
2539482
Run CI tests again just to be sure.
bdice Dec 15, 2020
4e8681e
Merge branch 'master' into fix/ignore-eexist
bdice Dec 16, 2020
96fa784
Merge branch 'master' into fix/ignore-eexist
bdice Dec 16, 2020
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 signac/contrib/import_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ def _copy_to_job_workspace(src, job, copytree):
try:
copytree(src, dst)
except OSError as error:
if error.errno in (errno.ENOTEMPTY, errno.EEXIST):
if error.errno in (errno.EEXIST, errno.ENOTEMPTY, errno.EACCES):
raise DestinationExistsError(job)
raise
else:
Expand Down
2 changes: 1 addition & 1 deletion signac/contrib/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def reset_statepoint(self, new_statepoint):
os.replace(self.workspace(), dst.workspace())
except OSError as error:
os.replace(fn_manifest_backup, fn_manifest) # rollback
if error.errno in (errno.ENOTEMPTY, errno.EACCES):
if error.errno in (errno.EEXIST, errno.ENOTEMPTY, errno.EACCES):
raise DestinationExistsError(dst)
else:
raise
Expand Down