Skip to content

Commit

Permalink
resolve conflicts; changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
vreuter committed Jun 18, 2019
2 parents 1658158 + 1059923 commit b6e8d08
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## [0.11.3] -- 2019-06-18
## [0.11.3] -- 2019-06-17
### Fixed
- Fixed a bug that caused an OSError removing lock files for some filesystems.

Expand Down
2 changes: 1 addition & 1 deletion pypiper/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.11.2"
__version__ = "0.11.3-dev"
3 changes: 2 additions & 1 deletion pypiper/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,8 @@ def _create_file_racefree(self, file):
:param str file: File to create.
"""
write_lock_flags = os.O_CREAT | os.O_EXCL | os.O_WRONLY
os.open(file, write_lock_flags)
fd = os.open(file, write_lock_flags)
os.close(fd)


@staticmethod
Expand Down

0 comments on commit b6e8d08

Please sign in to comment.