Skip to content

Commit

Permalink
Merge pull request #400 from gesslerpd/fix/windows
Browse files Browse the repository at this point in the history
Fix #399: ensure the git file finder closes file descriptor after reading archive
  • Loading branch information
RonnyPfannschmidt authored Jan 22, 2020
2 parents e57cf46 + 710434f commit 0df34c7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v3.4.3
======

* fix #399: ensure the git file finder terminates subprocess after reading archive

v3.4.2
======

Expand Down
4 changes: 2 additions & 2 deletions src/setuptools_scm/file_finder_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def _git_ls_files_and_dirs(toplevel):
try:
return _git_interpret_archive(proc.stdout, toplevel)
finally:
# ensure we avoid ressource warnings by cleaning up the pocess
proc.wait()
# ensure we avoid resource warnings by cleaning up the process
proc.terminate()
except Exception:
if proc.wait() != 0:
log.exception("listing git files failed - pretending there aren't any")
Expand Down

0 comments on commit 0df34c7

Please sign in to comment.