From b25d6cb96337d479bdcb41768356da414c3aa835 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aaionescu@protonmail.com>
Date: Fri, 17 Feb 2023 04:29:32 +0100
Subject: [PATCH] [utils] Fix race condition in `make_dir` (#6089)

Authored by: aionescu
---
 yt_dlp/cache.py | 6 +-----
 yt_dlp/utils.py | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/yt_dlp/cache.py b/yt_dlp/cache.py
index 7be91eae5..f8344fe77 100644
--- a/yt_dlp/cache.py
+++ b/yt_dlp/cache.py
@@ -39,11 +39,7 @@ class Cache:
 
         fn = self._get_cache_fn(section, key, dtype)
         try:
-            try:
-                os.makedirs(os.path.dirname(fn))
-            except OSError as ose:
-                if ose.errno != errno.EEXIST:
-                    raise
+            os.makedirs(os.path.dirname(fn), exist_ok=True)
             self._ydl.write_debug(f'Saving {section}.{key} to cache')
             write_json_file({'yt-dlp_version': __version__, 'data': data}, fn)
         except Exception:
diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py
index 2d9e61c5b..736468aef 100644
--- a/yt_dlp/utils.py
+++ b/yt_dlp/utils.py
@@ -5370,8 +5370,8 @@ def random_uuidv4():
 def make_dir(path, to_screen=None):
     try:
         dn = os.path.dirname(path)
-        if dn and not os.path.exists(dn):
-            os.makedirs(dn)
+        if dn:
+            os.makedirs(dn, exist_ok=True)
         return True
     except OSError as err:
         if callable(to_screen) is not None: