From 3afeaad0a7fe976c1872e4ef2a038e2f8ca5bf2b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 25 Jan 2024 18:03:19 +0000 Subject: [PATCH] Try to create the directory and don't fail if it already exists Signed-off-by: Pedro Algarvio --- salt/minion.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/salt/minion.py b/salt/minion.py index addc91fbc86..ad23f46e1f5 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -290,9 +290,8 @@ def get_proc_dir(cachedir, **kwargs): else: mode = {"mode": mode} - if not os.path.isdir(fn_): - # proc_dir is not present, create it with mode settings - os.makedirs(fn_, **mode) + # proc_dir is not present, create it with mode settings + os.makedirs(fn_, **mode, exist_ok=True) d_stat = os.stat(fn_) @@ -952,8 +951,7 @@ class SMinion(MinionBase): import salt.utils.yaml pdir = os.path.join(self.opts["cachedir"], "pillar") - if not os.path.isdir(pdir): - os.makedirs(pdir, 0o700) + os.makedirs(pdir, 0o700, exist_ok=True) ptop = os.path.join(pdir, "top.sls") if self.opts["saltenv"] is not None: penv = self.opts["saltenv"]