From 45998b3e371b819ce0dbe50da703809a048cc2fe Mon Sep 17 00:00:00 2001 From: Eveldee Date: Fri, 5 May 2023 07:31:41 +0200 Subject: [PATCH] [utils] `locked_file`: Fix for virtiofs (#6840) Authored by: brandon-dacrib Closes #6823 --- yt_dlp/utils.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 2f5e66720..47aa75c47 100644 --- 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: