saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Try to create the directory and don't fail if it already exists

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2024-01-25 18:03:19 +00:00
parent 560b24f1a6
commit 3afeaad0a7
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/minion.py
View file

@ -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"]