Merge pull request #21437 from rallytime/bp-21409

Backport #21409 to 2014.7
saltstack · Mar 9, 2015 · 6ac6a53 · 6ac6a53
2 parents 4fb4178 + 8a65d8c
commit 6ac6a53
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/salt/utils/verify.py b/salt/utils/verify.py
@@ -10,6 +10,7 @@
 import re
 import sys
 import stat
+import errno
 import socket
 import logging
 
@@ -161,8 +162,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('')