|
 |
be966de |
From a6b4effcfb24780d9d2d1b76efa33132381f76eb Mon Sep 17 00:00:00 2001
|
|
|
be966de |
From: Mattia Rizzolo <mattia@debian.org>
|
|
|
be966de |
Date: Sun, 1 Jul 2018 20:53:48 +0200
|
|
|
be966de |
Subject: [PATCH] tempfiles: empty the list of known tempfiles after removing
|
|
|
be966de |
them
|
|
|
be966de |
|
|
|
be966de |
tempfiles would be cleaned up between tests, so the new "base directory"
|
|
|
be966de |
would be removed as well, that made the next tentative to create a temporary
|
|
|
be966de |
directory fail.
|
|
|
be966de |
|
|
|
be966de |
This is not interesting for regular execution of diffoscope, as only
|
|
|
be966de |
programs executing diffoscope.main.main() twice within the same python
|
|
|
be966de |
process would notice.
|
|
|
be966de |
|
|
|
be966de |
Closes: #902709
|
|
|
be966de |
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
|
|
|
be966de |
---
|
|
|
be966de |
diffoscope/tempfiles.py | 2 ++
|
|
|
be966de |
1 file changed, 2 insertions(+)
|
|
|
be966de |
|
|
|
be966de |
diff --git a/diffoscope/tempfiles.py b/diffoscope/tempfiles.py
|
|
|
be966de |
index 4e4e93f3d9..83357d6d86 100644
|
|
|
be966de |
--- a/diffoscope/tempfiles.py
|
|
|
be966de |
+++ b/diffoscope/tempfiles.py
|
|
|
be966de |
@@ -55,6 +55,7 @@ def clean_all_temp_files():
|
|
|
be966de |
pass
|
|
|
be966de |
except:
|
|
|
be966de |
logger.exception("Unable to delete %s", x)
|
|
|
be966de |
+ _FILES.clear()
|
|
|
be966de |
|
|
|
be966de |
logger.debug("Cleaning %d temporary directories", len(_DIRS))
|
|
|
be966de |
|
|
|
be966de |
@@ -75,6 +76,7 @@ def clean_all_temp_files():
|
|
|
be966de |
pass
|
|
|
be966de |
except:
|
|
|
be966de |
logger.exception("Unable to delete %s", x)
|
|
|
be966de |
+ _DIRS.clear()
|
|
|
be966de |
|
|
|
be966de |
|
|
|
be966de |
def _get_base_temporary_directory():
|