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

move exception for clarity

Browse Source
This commit is contained in:
lomeroe 2018-04-10 15:50:25 -05:00
parent 32ce5bfda5
commit 369a0645ed
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/modules/win_lgpo.py
View File

@ -4647,20 +4647,21 @@ def _getScriptSettingsFromIniFile(policy_info):
try: try:
_existingData = deserialize(_existingData.decode('utf-16-le').lstrip('\ufeff')) _existingData = deserialize(_existingData.decode('utf-16-le').lstrip('\ufeff'))
log.debug('Have deserialized data {0}'.format(_existingData)) log.debug('Have deserialized data {0}'.format(_existingData))
if 'Section' in policy_info['ScriptIni'] and policy_info['ScriptIni']['Section'].lower() in [z.lower() for z in _existingData.keys()]:
if 'SettingName' in policy_info['ScriptIni']:
log.debug('Need to look for {0}'.format(policy_info['ScriptIni']['SettingName']))
if policy_info['ScriptIni']['SettingName'].lower() in [z.lower() for z in _existingData[policy_info['ScriptIni']['Section']].keys()]:
return _existingData[policy_info['ScriptIni']['Section']][policy_info['ScriptIni']['SettingName'].lower()]
else:
return None
else:
return _existingData[policy_info['ScriptIni']['Section']]
else:
return None
except Exception as error: except Exception as error:
log.error('An error occurred attempting to get {0}'.format(policy_info['Policy'])) log.error('An error occurred attempting to deserialize data for {0}'.format(policy_info['Policy']))
raise CommandExecutionError(error) raise CommandExecutionError(error)
if 'Section' in policy_info['ScriptIni'] and policy_info['ScriptIni']['Section'].lower() in [z.lower() for z in _existingData.keys()]:
if 'SettingName' in policy_info['ScriptIni']:
log.debug('Need to look for {0}'.format(policy_info['ScriptIni']['SettingName']))
if policy_info['ScriptIni']['SettingName'].lower() in [z.lower() for z in _existingData[policy_info['ScriptIni']['Section']].keys()]:
return _existingData[policy_info['ScriptIni']['Section']][policy_info['ScriptIni']['SettingName'].lower()]
else:
return None
else:
return _existingData[policy_info['ScriptIni']['Section']]
else:
return None
return None return None