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

Merge pull request #14698 from hemebond/2014.7

Browse Source 
Quote paths passed to patch. Fixes #14536.
This commit is contained in:
Erik Johnson 2014-08-02 22:37:35 -05:00
commit d6abc8c71e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/file.py
View File

@ -1451,7 +1451,7 @@ def patch(originalfile, patchfile, options='', dry_run=False):
dry_run_opt = ' --dry-run' dry_run_opt = ' --dry-run'
else: else:
dry_run_opt = '' dry_run_opt = ''
cmd = 'patch {0}{1} {2} {3}'.format( cmd = 'patch {0}{1} "{2}" "{3}"'.format(
options, dry_run_opt, originalfile, patchfile) options, dry_run_opt, originalfile, patchfile)
return __salt__['cmd.run_all'](cmd) return __salt__['cmd.run_all'](cmd)