Merge "Handle file removal concurrency"

2021-11-03 17:59:11 +00:00 · 2021-11-03 17:59:11 +00:00 · 7af23e5159
commit 7af23e5159
parent 5776ac688c f841c0826b
1 changed files with 8 additions and 4 deletions
--- a/tools/common.py
+++ b/tools/common.py
@ -124,10 +124,14 @@ def make_dir(dirname):
 def remove_file(filename):
    if os.path.isfile(filename):
        LOG.debug("Remove file: '%s'", filename)
-        os.unlink(filename)
-        return True
-    else:
-        return False
+        try:
+            os.unlink(filename)
+        except FileNotFoundError:
+            LOG.debug("File concurrently removed: '%s'", filename)
+        else:
+            LOG.debug("File removed: '%s'", filename)
+            return True
+    return False


@contextlib.contextmanager