Merge "Handle file removal concurrency"

This commit is contained in:
Zuul
2021-11-03 17:59:11 +00:00
committed by Gerrit Code Review

View File

@@ -124,10 +124,14 @@ def make_dir(dirname):
def remove_file(filename): def remove_file(filename):
if os.path.isfile(filename): if os.path.isfile(filename):
LOG.debug("Remove file: '%s'", filename) LOG.debug("Remove file: '%s'", filename)
os.unlink(filename) try:
return True os.unlink(filename)
else: except FileNotFoundError:
return False LOG.debug("File concurrently removed: '%s'", filename)
else:
LOG.debug("File removed: '%s'", filename)
return True
return False
@contextlib.contextmanager @contextlib.contextmanager