Merge pull request #27024 from rallytime/bp-27004

Back-port #27004 to 2015.5
This commit is contained in:
Justin Findlay 2015-09-10 15:14:20 -06:00
commit 9e06d3f01a

View File

@ -74,7 +74,11 @@ def get_path():
'''
ret = __salt__['reg.read_key']('HKEY_LOCAL_MACHINE',
'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment',
'PATH').split(';')
'PATH')
if isinstance(ret, dict):
ret = ret['vdata'].split(';')
if isinstance(ret, str):
ret = ret.split(';')
# Trim ending backslash
return list(map(_normalize_dir, ret))