diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2020-01-22 21:47:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 21:47:57 +0100 |
| commit | 0df34c7c3cecb8409d22a2a45d958457c30fbfde (patch) | |
| tree | 34183e555a232eb9db98376ee25671b52f6e2f39 | |
| parent | e57cf4637f4b60c1085a56b08958f51ef7aae469 (diff) | |
| parent | 710434f2f9ef383108fa91505487377aa6b755c4 (diff) | |
| download | setuptools-scm-0df34c7c3cecb8409d22a2a45d958457c30fbfde.tar.gz | |
Merge pull request #400 from gesslerpd/fix/windowsv3.4.3
Fix #399: ensure the git file finder closes file descriptor after reading archive
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | src/setuptools_scm/file_finder_git.py | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d8807a0..bb09487 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +v3.4.3 +====== + +* fix #399: ensure the git file finder terminates subprocess after reading archive + v3.4.2 ====== diff --git a/src/setuptools_scm/file_finder_git.py b/src/setuptools_scm/file_finder_git.py index 5cda162..651e76c 100644 --- a/src/setuptools_scm/file_finder_git.py +++ b/src/setuptools_scm/file_finder_git.py @@ -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") |