saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45137 from twangboy/win_fix_reg_tests

Browse source 
Catch correct error type in list_keys and list_values
This commit is contained in:
Nicole Thomas 2017-12-22 09:45:21 -05:00 • committed by GitHub
commit dc357b39f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/reg.py
View file

@ -240,7 +240,7 @@ def list_keys(hive, key=None, use_32bit_registry=False):
handle.Close()
except WindowsError as exc: # pylint: disable=E0602
except pywintypes.error as exc: # pylint: disable=E0602
log.debug(exc)
log.debug('Cannot find key: {0}\\{1}'.format(hive, key))
return False, 'Cannot find key: {0}\\{1}'.format(hive, key)
@ -300,7 +300,7 @@ def list_values(hive, key=None, use_32bit_registry=False, include_default=True):
'vtype': registry.vtype_reverse[vtype],
'success': True}
values.append(value)
except WindowsError as exc: # pylint: disable=E0602
except pywintypes.error as exc: # pylint: disable=E0602
log.debug(exc)
log.debug(r'Cannot find key: {0}\{1}'.format(hive, key))
return False, r'Cannot find key: {0}\{1}'.format(hive, key)