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

Handle missing registry entries

Browse source
This commit is contained in:
twangboy 2018-06-28 12:59:36 -06:00
parent 5b29cd326f
commit 776db98a5c
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/proxy.py
View file

@ -63,7 +63,7 @@ def _get_proxy_windows(types=None):
'ProxyServer')
servers = reg_val['vdata']
if "=" in servers:
if servers and "=" in servers:
split = servers.split(";")
for s in split:
if len(s) == 0:
@ -312,7 +312,9 @@ def get_proxy_bypass(network_service="Ethernet"):
reg_val = __salt__['reg.read_value']('HKEY_CURRENT_USER',
r'SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings',
'ProxyOverride')
bypass_servers = reg_val['vdata'].replace("<local>", "").split(";")
bypass_servers = []
if reg_val['vdata']:
bypass_servers = reg_val['vdata'].replace("<local>", "").split(";")
return bypass_servers