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

Merge pull request #47848 from twangboy/fix_47784

Browse Source 
Fix some major issues with the LGPO module
This commit is contained in:
Nicole Thomas 2018-05-30 09:37:32 -04:00 committed by GitHub
commit f15e636d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/modules/win_lgpo.py
View File

@ -35,7 +35,7 @@ Current known limitations
- lxml - lxml
- uuid - uuid
- struct - struct
- salt.modules.reg - salt.utils.win_reg
''' '''
# Import Python libs # Import Python libs
from __future__ import absolute_import, unicode_literals, print_function from __future__ import absolute_import, unicode_literals, print_function
@ -98,7 +98,7 @@ try:
import lxml import lxml
import struct import struct
from lxml import etree from lxml import etree
from salt.modules.reg import Registry as Registry from salt.utils.win_reg import Registry
HAS_WINDOWS_MODULES = True HAS_WINDOWS_MODULES = True
TRUE_VALUE_XPATH = etree.XPath('.//*[local-name() = "trueValue"]') TRUE_VALUE_XPATH = etree.XPath('.//*[local-name() = "trueValue"]')
FALSE_VALUE_XPATH = etree.XPath('.//*[local-name() = "falseValue"]') FALSE_VALUE_XPATH = etree.XPath('.//*[local-name() = "falseValue"]')
@ -2672,9 +2672,11 @@ def __virtual__():
''' '''
Only works on Windows systems Only works on Windows systems
''' '''
if salt.utils.platform.is_windows() and HAS_WINDOWS_MODULES: if not salt.utils.platform.is_windows():
return __virtualname__ return False, 'win_lgpo: Not a Windows System'
return False if not HAS_WINDOWS_MODULES:
return False, 'win_lgpo: Required modules failed to load'
return __virtualname__
def _updateNamespace(item, new_namespace): def _updateNamespace(item, new_namespace):
@ -5372,7 +5374,7 @@ def set_(computer_policy=None, user_policy=None,
else: else:
raise SaltInvocationError(msg) raise SaltInvocationError(msg)
if policy_namespace and policy_name in _admTemplateData[policy_namespace] and the_policy is not None: if policy_namespace and policy_name in _admTemplateData[policy_namespace] and the_policy is not None:
log.debug('setting == %s', _admTemplateData[policy_namespace][policy_name].lower()) log.debug('setting == %s', six.text_type(_admTemplateData[policy_namespace][policy_name]).lower())
log.debug(six.text_type(_admTemplateData[policy_namespace][policy_name]).lower()) log.debug(six.text_type(_admTemplateData[policy_namespace][policy_name]).lower())
if six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'disabled' \ if six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'disabled' \
and six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'not configured': and six.text_type(_admTemplateData[policy_namespace][policy_name]).lower() != 'not configured':