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

Adding a check in case the cache file is empty.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2017-09-04 18:06:11 -07:00
parent 594c324beb
commit b2475b1c35
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/modules/mount.py
View File

@ -1303,12 +1303,20 @@ def write_mount_cache(real_name,
'''
cache = salt.utils.mount.read_cache(__opts__)
if 'mounts' in cache:
cache['mounts'][real_name] = {'device': device,
'fstype': fstype,
'mkmnt': mkmnt,
'opts': opts}
if cache:
if 'mounts' in cache:
cache['mounts'][real_name] = {'device': device,
'fstype': fstype,
'mkmnt': mkmnt,
'opts': opts}
else:
cache['mounts'] = {}
cache['mounts'][real_name] = {'device': device,
'fstype': fstype,
'mkmnt': mkmnt,
'opts': opts}
else:
cache = {}
cache['mounts'] = {}
cache['mounts'][real_name] = {'device': device,
'fstype': fstype,
@ -1333,8 +1341,9 @@ def delete_mount_cache(real_name):
'''
cache = salt.utils.mount.read_cache(__opts__)
if 'mounts' in cache:
if real_name in cache['mounts']:
del cache['mounts'][real_name]
cache = salt.utils.mount.write_cache(cache, __opts__)
if cache:
if 'mounts' in cache:
if real_name in cache['mounts']:
del cache['mounts'][real_name]
cache = salt.utils.mount.write_cache(cache, __opts__)
return True