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

Test fix: file strings must be unicode in master config

Browse source
This commit is contained in:
rallytime 2018-04-20 15:04:54 -04:00
parent bee4948df1
commit f90fd8c663
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/config/__init__.py
View file

@ -3883,7 +3883,9 @@ def apply_master_config(overrides=None, defaults=None):
if overrides:
opts.update(overrides)
opts['__cli'] = os.path.basename(sys.argv[0])
opts['__cli'] = salt.utils.stringutils.to_unicode(
os.path.basename(sys.argv[0])
)
if 'environment' in opts:
if opts['saltenv'] is not None: