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

Remove double-stating file while generating grains

Browse Source
This commit is contained in:
Bo Maryniuk 2018-02-20 16:24:31 +01:00
parent 8aa0e83be6
commit bba2b93e79
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/grains/core.py
View File

@ -2489,15 +2489,15 @@ def _linux_iqn():
initiator = '/etc/iscsi/initiatorname.iscsi'
if os.path.isfile(initiator):
if os.access(initiator, os.R_OK):
with salt.utils.files.fopen(initiator, 'r') as _iscsi:
for line in _iscsi:
line = line.strip()
if line.startswith('InitiatorName='):
ret.append(line.split('=', 1)[1])
else:
log.debug('Access denied to %s', initiator)
try:
with salt.utils.files.fopen(initiator, 'r') as _iscsi:
for line in _iscsi:
line = line.strip()
if line.startswith('InitiatorName='):
ret.append(line.split('=', 1)[1])
except OSError as ex:
if ex.errno != ex.errno.ENOENT:
log.debug("Error while accessing '%s': %s", initiator, ex)
return ret