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

Allows cp.push to recreate empty files

Browse source 
Fixes #23288
cp.push and cp.push_dir now can recreate empty files
This commit is contained in:
Jason Hamner 2015-07-29 09:16:45 -06:00
parent 00f4689fe3
commit eac19fbf33
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/modules/cp.py
View file

@ -700,10 +700,11 @@ def push(path, keep_symlinks=False):
'tok': auth.gen_token('salt')}
channel = salt.transport.Channel.factory(__opts__)
with salt.utils.fopen(path, 'rb') as fp_:
init_send = False
while True:
load['loc'] = fp_.tell()
load['data'] = fp_.read(__opts__['file_buffer_size'])
if not load['data']:
if not load['data'] and init_send:
return True
ret = channel.send(load)
if not ret:
@ -711,6 +712,7 @@ def push(path, keep_symlinks=False):
'\'file_recv\' set to \'True\' and that the file is not '
'larger than the \'file_recv_size_max\' setting on the master.')
return ret
init_send = True
def push_dir(path, glob=None):