Merge pull request #54896 from twangboy/fix_win_lgpo

Multiple LGPO Fixes
saltstack · Jan 6, 2020 · 702557f · 702557f
2 parents 4fed7e0 + 16133ea
commit 702557f
Show file tree

Hide file tree

Showing 8 changed files with 2,649 additions and 1,220 deletions.
diff --git a/salt/modules/win_lgpo.py b/salt/modules/win_lgpo.py
diff --git a/salt/states/loop.py b/salt/states/loop.py
@@ -200,7 +200,7 @@ def until_no_eval(
         current_attempt += 1
         try:
             res = __salt__[name](*args, **kwargs)
-        except Exception:
+        except Exception:  # pylint: disable=broad-except
             (exc_type, exc_value, _) = sys.exc_info()
             ret['comment'] = 'Exception occurred while executing {}: {}:{}'.format(name, exc_type, exc_value)
             break

diff --git a/salt/states/win_lgpo.py b/salt/states/win_lgpo.py
diff --git a/salt/utils/win_reg.py b/salt/utils/win_reg.py
@@ -89,6 +89,8 @@ def _to_unicode(vdata):
     # None does not convert to Unicode
     if vdata is None:
         return None
+    if isinstance(vdata, int):
+        vdata = str(vdata)
     return salt.utils.stringutils.to_unicode(vdata, 'utf-8')
 
 
@@ -522,7 +524,7 @@ def read_value(hive, key, vname=None, use_32bit_registry=False):
         try:
             # RegQueryValueEx returns and accepts unicode data
             vdata, vtype = win32api.RegQueryValueEx(handle, local_vname)
-            if vdata or vdata in [0, '']:
+            if vdata or vdata in [0, '', []]:
                 # Only convert text types to unicode
                 ret['vtype'] = registry.vtype_reverse[vtype]
                 if vtype == win32con.REG_MULTI_SZ:

diff --git a/tests/integration/modules/test_win_lgpo.py b/tests/integration/modules/test_win_lgpo.py