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

Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes

Browse source
This commit is contained in:
FELD Boris 2015-05-12 15:04:53 +02:00 • committed by rallytime
parent fabef759e0
commit 18d5ff9a8e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/states/file.py
View file

@ -243,6 +243,7 @@ import pprint
import shutil
import traceback
import yaml
from itertools import izip_longest
# Import salt libs
import salt.payload
@ -658,7 +659,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(izip_longest(sources, source_hashes[:len(sources)]))
def _get_template_texts(source_list=None,