From 1533e33ede0ef5375f0c27d5292275e2516c74f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Mon, 18 Sep 2023 10:38:05 +0200
Subject: [PATCH] fix: remove locks from the archived directories

---
 bin/archiver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/archiver.py b/bin/archiver.py
index 41e7dccd..0937bd2f 100755
--- a/bin/archiver.py
+++ b/bin/archiver.py
@@ -204,6 +204,7 @@ class Archiver(AbstractManager):
                 dest_dir.mkdir(parents=True, exist_ok=True)
                 capture_breakpoint = 100
                 self.logger.info(f'{len(captures)} captures to archive in {year}-{month}.')
+                locks_to_clear: List[Path] = []
                 for capture_path in captures:
                     lock_file = capture_path / 'lock'
                     if try_make_file(lock_file):
@@ -240,9 +241,11 @@ class Archiver(AbstractManager):
                     except OSError as e:
                         self.logger.warning(f'Unable to archive capture: {e}')
                     finally:
-                        lock_file.unlink(missing_ok=True)
+                        locks_to_clear.append(dest_dir / capture_path.name / 'lock')
                 # we archived some captures, update relevant index
                 self._update_index(dest_dir)
+                for lock in locks_to_clear:
+                    lock.unlink(missing_ok=True)
                 if not archiving_done:
                     break
             else: