valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11688 from hulu/file-prepend-shadowing

Browse Source 
states.file: avoid shadowing prepend() func
This commit is contained in:
Pedro Algarvio 2014-04-01 05:43:51 +01:00
commit 6e99e8cfcd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/file.py
View File

@ -2641,7 +2641,7 @@ def prepend(name,
count = 0
prepend = []
preface = []
for chunk in text:
if __salt__['file.contains_regex_multiline'](
@ -2663,10 +2663,10 @@ def prepend(name,
ret['comment'] = 'File {0} is set to be updated'.format(name)
ret['result'] = None
return ret
prepend.append(line)
preface.append(line)
count += 1
__salt__['file.prepend'](name, *prepend)
__salt__['file.prepend'](name, *preface)
with salt.utils.fopen(name, 'rb') as fp_:
nlines = fp_.readlines()