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 #23669 from rallytime/bp-23586

Browse source 
Backport #23586 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-13 12:27:11 -06:00
commit 0dad6be0fc
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/states/file.py
View file

@ -251,9 +251,9 @@ import salt.utils.templates
from salt.exceptions import CommandExecutionError
from salt.utils.serializers import yaml as yaml_serializer
from salt.utils.serializers import json as json_serializer
from salt.ext.six.moves import map
import salt.ext.six as six
from salt.ext.six import string_types, integer_types
from salt.ext.six.moves import zip_longest
log = logging.getLogger(__name__)
@ -658,7 +658,7 @@ def _unify_sources_and_hashes(source=None, source_hash=None,
return (True, '', [(source, source_hash)])
# Make a nice neat list of tuples exactly len(sources) long..
return True, '', list(map(None, sources, source_hashes[:len(sources)]))
return True, '', list(zip_longest(sources, source_hashes[:len(sources)]))
def _get_template_texts(source_list=None,