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 #36244 from terminalmage/gen-back-bug

Browse source 
salt.fileserver.Fileserver: Don't try to split a list in _gen_back
This commit is contained in:
Mike Place 2016-09-13 09:53:16 +09:00 • committed by GitHub
commit b0dd6ff5c8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/fileserver/__init__.py
View file

@ -323,10 +323,11 @@ class Fileserver(object):
if not back:
back = self.opts['fileserver_backend']
else:
try:
back = back.split(',')
except AttributeError:
back = six.text_type(back).split(',')
if not isinstance(back, list):
try:
back = back.split(',')
except AttributeError:
back = six.text_type(back).split(',')
ret = []
if not isinstance(back, list):