valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8193 from jcsp/verify-fix

Browse Source 
Improve error reporting from verify_files
This commit is contained in:
Colton Myers 2013-10-31 12:14:30 -07:00
commit c67ecff2bd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/utils/verify.py
View File

@ -161,11 +161,17 @@ def verify_files(files, user):
sys.exit(2)
for fn_ in files:
dirname = os.path.dirname(fn_)
if not os.path.isdir(dirname):
os.makedirs(dirname)
if not os.path.isfile(fn_):
with salt.utils.fopen(fn_, 'w+') as fp_:
fp_.write('')
try:
if not os.path.isdir(dirname):
os.makedirs(dirname)
if not os.path.isfile(fn_):
with salt.utils.fopen(fn_, 'w+') as fp_:
fp_.write('')
except OSError as err:
msg = 'Failed to create path "{0}" - {1}\n'
sys.stderr.write(msg.format(fn_, err))
sys.exit(err.errno)
stats = os.stat(fn_)
if uid != stats.st_uid:
try: