Merge pull request #21409 from jquast/makedirs-race-condition

Gracefully handle race condition of 'makedirs'

salt/utils/verify.py

@@ -11,6 +11,7 @@
 import re
 import sys
 import stat
+import errno
 import socket
 import logging
 
@@ -162,8 +163,11 @@ def verify_files(files, user):
     for fn_ in files:
         dirname = os.path.dirname(fn_)
         try:
-            if not os.path.isdir(dirname):
+            try:
                 os.makedirs(dirname)
+            except OSError as err:
+                if err.errno != errno.EEXIST:
+                    raise
             if not os.path.isfile(fn_):
                 with salt.utils.fopen(fn_, 'w+') as fp_:
                     fp_.write('')