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

correct issue when running get with return_not_configured=True (#39085)

Browse Source 
lint indentation fixes
This commit is contained in:
lomeroe 2017-02-02 17:04:42 -06:00 committed by Nicole Thomas
parent 26eea61678
commit 8c0dc9162a
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/win_lgpo.py
View File

@ -2820,7 +2820,8 @@ def _checkAllAdmxPolicies(policy_class,
log.debug('returning non configured policies')
not_configured_policies = ALL_CLASS_POLICY_XPATH(admx_policy_definitions, registry_class=policy_class)
for policy_item in admx_policies:
not_configured_policies.remove(policy_item)
if policy_item in not_configured_policies:
not_configured_policies.remove(policy_item)
for not_configured_policy in not_configured_policies:
policy_vals[not_configured_policy.attrib['name']] = 'Not Configured'
@ -2830,6 +2831,11 @@ def _checkAllAdmxPolicies(policy_class,
not_configured_policy.attrib['name'],
return_full_policy_names,
adml_policy_resources)
log.debug('building hierarchy for non-configured item {0}'.format(not_configured_policy.attrib['name']))
hierarchy[not_configured_policy.attrib['name']] = _build_parent_list(not_configured_policy,
admx_policy_definitions,
return_full_policy_names,
adml_policy_resources)
for admx_policy in admx_policies:
this_key = None
this_valuename = None
@ -3139,7 +3145,7 @@ def _checkAllAdmxPolicies(policy_class,
policy_vals[full_names[policy_item]] = policy_vals.pop(policy_item)
unpathed_dict[full_names[policy_item]] = policy_item
# go back and remove any "unpathed" policies that need a full path
for path_needed in pathed_dict.keys():
for path_needed in unpathed_dict.keys():
# remove the item with the same full name and re-add it w/a path'd version
full_path_list = hierarchy[unpathed_dict[path_needed]]
full_path_list.reverse()
@ -4225,9 +4231,9 @@ def set_computer_policy(name,
pol = {}
pol[name] = setting
ret = set_(computer_policy=pol,
user_policy=None,
cumulative_rights_assignments=cumulative_rights_assignments,
adml_language=adml_language)
user_policy=None,
cumulative_rights_assignments=cumulative_rights_assignments,
adml_language=adml_language)
return ret
@ -4254,9 +4260,9 @@ def set_user_policy(name,
pol = {}
pol[name] = setting
ret = set_(user_policy=pol,
computer_policy=None,
cumulative_rights_assignments=True,
adml_language=adml_language)
computer_policy=None,
cumulative_rights_assignments=True,
adml_language=adml_language)
return ret