[utils] locked_file: Fix for virtiofs (#6840)

Authored by: brandon-dacrib Closes #6823
yt-dlp · May 5, 2023 · 45998b3 · 45998b3
1 parent 2f07c4c
commit 45998b3
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py
@@ -2187,10 +2187,11 @@ def _lock_file(f, exclusive, block):
                 fcntl.lockf(f, flags)
 
         def _unlock_file(f):
-            try:
-                fcntl.flock(f, fcntl.LOCK_UN)
-            except OSError:
-                fcntl.lockf(f, fcntl.LOCK_UN)
+            with contextlib.suppress(OSError):
+                return fcntl.flock(f, fcntl.LOCK_UN)
+            with contextlib.suppress(OSError):
+                return fcntl.lockf(f, fcntl.LOCK_UN)  # AOSP does not have flock()
+            return fcntl.flock(f, fcntl.LOCK_UN | fcntl.LOCK_NB)  # virtiofs needs LOCK_NB on unlocking
 
     except ImportError: